Media Codec API just got a visit from the coding style police.
We now use "const" for the chunk buffer pointer returned by GetNextChunk, because the buffer is not supposed to be modified by the codec. size_t is used for the size where applicable. This matches BMediaDecoder. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@13361 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -11,7 +11,7 @@ namespace BPrivate { namespace media {
|
||||
|
||||
class ChunkProvider {
|
||||
public:
|
||||
virtual status_t GetNextChunk(void **chunkBuffer, int32 *chunkSize,
|
||||
virtual status_t GetNextChunk(const void **chunkBuffer, size_t *chunkSize,
|
||||
media_header *mediaHeader) = 0;
|
||||
};
|
||||
|
||||
@@ -24,7 +24,7 @@ public:
|
||||
virtual void GetCodecInfo(media_codec_info *codecInfo) = 0;
|
||||
|
||||
// Setup get's called with the info data from Reader::GetStreamInfo
|
||||
virtual status_t Setup(media_format *ioEncodedFormat, const void *infoBuffer, int32 infoSize) = 0;
|
||||
virtual status_t Setup(media_format *ioEncodedFormat, const void *infoBuffer, size_t infoSize) = 0;
|
||||
|
||||
virtual status_t NegotiateOutputFormat(media_format *ioDecodedFormat) = 0;
|
||||
|
||||
@@ -35,7 +35,7 @@ public:
|
||||
virtual status_t Decode(void *buffer, int64 *frameCount,
|
||||
media_header *mediaHeader, media_decode_info *info = 0) = 0;
|
||||
|
||||
status_t GetNextChunk(void **chunkBuffer, int32 *chunkSize,
|
||||
status_t GetNextChunk(const void **chunkBuffer, size_t *chunkSize,
|
||||
media_header *mediaHeader);
|
||||
|
||||
void Setup(ChunkProvider *provider);
|
||||
|
||||
@@ -14,8 +14,8 @@ struct stream_info
|
||||
status_t status;
|
||||
void * cookie;
|
||||
bool hasCookie;
|
||||
void * infoBuffer;
|
||||
int32 infoBufferSize;
|
||||
const void * infoBuffer;
|
||||
size_t infoBufferSize;
|
||||
ChunkCache * chunkCache;
|
||||
media_format encodedFormat;
|
||||
};
|
||||
@@ -40,7 +40,7 @@ public:
|
||||
int64 *frame, bigtime_t *time);
|
||||
|
||||
status_t GetNextChunk(int32 stream,
|
||||
void **chunkBuffer, int32 *chunkSize,
|
||||
const void **chunkBuffer, size_t *chunkSize,
|
||||
media_header *mediaHeader);
|
||||
|
||||
status_t CreateDecoder(int32 stream, Decoder **decoder, media_codec_info *mci);
|
||||
|
||||
@@ -27,14 +27,14 @@ public:
|
||||
virtual status_t FreeCookie(void *cookie) = 0;
|
||||
|
||||
virtual status_t GetStreamInfo(void *cookie, int64 *frameCount, bigtime_t *duration,
|
||||
media_format *format, void **infoBuffer, int32 *infoSize) = 0;
|
||||
media_format *format, const void **infoBuffer, size_t *infoSize) = 0;
|
||||
|
||||
virtual status_t Seek(void *cookie,
|
||||
uint32 seekTo,
|
||||
int64 *frame, bigtime_t *time) = 0;
|
||||
|
||||
virtual status_t GetNextChunk(void *cookie,
|
||||
void **chunkBuffer, int32 *chunkSize,
|
||||
const void **chunkBuffer, size_t *chunkSize,
|
||||
media_header *mediaHeader) = 0;
|
||||
|
||||
BDataIO * Source();
|
||||
|
||||
Reference in New Issue
Block a user