Aren
/
haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FFMPEG Plugin: Calculate media_header.size_used field 

- This field is needed by the dvb.media_addon to detect a format change so
  fill it with the correct value.
- Updated documentation accordingly to reflect reordered function calls and new
  assumptions based on the function call ordering.
This commit is contained in:
Colin Günther 2014-08-07 19:59:31 +02:00
parent 069bc5b597
commit b77f1724a2
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/add-ons/media/plugins/ffmpeg/AVCodecDecoder.cpp
View File

@ -680,7 +680,7 @@ AVCodecDecoder::_DecodeVideo(void* outBuffer, int64* outFrameCount,
*outFrameCount = 1; *outFrameCount = 1;
*mediaHeader = fHeader; *mediaHeader = fHeader;
memcpy(outBuffer, fDecodedData, fDecodedDataSizeInBytes); memcpy(outBuffer, fDecodedData, mediaHeader->size_used);
fDecodedDataSizeInBytes = 0; fDecodedDataSizeInBytes = 0;
@ -960,8 +960,8 @@ AVCodecDecoder::_CopyChunkToVideoChunkBufferAndAddPadding(const void* chunk,
void void
AVCodecDecoder::_HandleNewVideoFrameAndUpdateSystemState() AVCodecDecoder::_HandleNewVideoFrameAndUpdateSystemState()
{ {
_UpdateMediaHeaderForVideoFrame();
_DeinterlaceAndColorConvertVideoFrame(); _DeinterlaceAndColorConvertVideoFrame();
_UpdateMediaHeaderForVideoFrame();
ConvertAVCodecContextToVideoFrameRate(*fContext, fOutputFrameRate); ConvertAVCodecContextToVideoFrameRate(*fContext, fOutputFrameRate);
@ -1023,15 +1023,15 @@ AVCodecDecoder::_FlushOneVideoFrameFromDecoderBuffer()
1. We actually got a new picture decoded by the video decoder. 1. We actually got a new picture decoded by the video decoder.
2. fHeader wasn't updated for the new picture yet. You MUST call this 2. fHeader wasn't updated for the new picture yet. You MUST call this
method only once per decoded video frame. method only once per decoded video frame.
3. This function MUST be called before 3. This function MUST be called after
_DeinterlaceAndColorConvertVideoFrame() as the later one relys on an _DeinterlaceAndColorConvertVideoFrame() as it relys on an updated
updated fHeader. fDecodedDataSizeInBytes.
4. There will be at maximumn only one decoded video frame in our cache 4. There will be at maximumn only one decoded video frame in our cache
at any single point in time. Otherwise you couldn't tell to which at any single point in time. Otherwise you couldn't tell to which
cached decoded video frame the properties in fHeader relate to. cached decoded video frame the properties in fHeader relate to.
5. AVCodecContext is still valid for this video frame (This is the case 5. AVCodecContext is still valid for this video frame (This is the case
when this function is called immediately after when this function is called after avcodec_decode_video2() and
avcodec_decode_video2(). before the next call to avcodec_decode_video2().
*/ */
void void
AVCodecDecoder::_UpdateMediaHeaderForVideoFrame() AVCodecDecoder::_UpdateMediaHeaderForVideoFrame()
@ -1040,6 +1040,7 @@ AVCodecDecoder::_UpdateMediaHeaderForVideoFrame()
fHeader.file_pos = 0; fHeader.file_pos = 0;
fHeader.orig_size = 0; fHeader.orig_size = 0;
fHeader.start_time = fRawDecodedPicture->reordered_opaque; fHeader.start_time = fRawDecodedPicture->reordered_opaque;
fHeader.size_used = fDecodedDataSizeInBytes;
fHeader.u.raw_video.display_line_width = fRawDecodedPicture->width; fHeader.u.raw_video.display_line_width = fRawDecodedPicture->width;
fHeader.u.raw_video.display_line_count = fRawDecodedPicture->height; fHeader.u.raw_video.display_line_count = fRawDecodedPicture->height;
fHeader.u.raw_video.bytes_per_row fHeader.u.raw_video.bytes_per_row
@ -1071,8 +1072,7 @@ AVCodecDecoder::_UpdateMediaHeaderForVideoFrame()
converted yet (otherwise this function behaves in unknown manners). converted yet (otherwise this function behaves in unknown manners).
You should only call this function when you got a new picture decoded by You should only call this function when you got a new picture decoded by
the video decoder and the fHeader variable was updated accordingly (\see the video decoder..
_UpdateMediaHeaderForVideoFrame()).
When this function finishes the postprocessed video frame will be available When this function finishes the postprocessed video frame will be available
in fPostProcessedDecodedPicture and fDecodedData (fDecodedDataSizeInBytes in fPostProcessedDecodedPicture and fDecodedData (fDecodedDataSizeInBytes
@ -1081,8 +1081,8 @@ AVCodecDecoder::_UpdateMediaHeaderForVideoFrame()
void void
AVCodecDecoder::_DeinterlaceAndColorConvertVideoFrame() AVCodecDecoder::_DeinterlaceAndColorConvertVideoFrame()
{ {
int displayWidth = fHeader.u.raw_video.display_line_width; int displayWidth = fRawDecodedPicture->width;
int displayHeight = fHeader.u.raw_video.display_line_count; int displayHeight = fRawDecodedPicture->height;
AVPicture deinterlacedPicture; AVPicture deinterlacedPicture;
bool useDeinterlacedPicture = false; bool useDeinterlacedPicture = false;