virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

libopenh264dec: Use a newer decoding entry point function

Browse Source 
The "new" entry point actually has existed since OpenH264 1.4 in
2015 and is the the recommended decoding entry point.

The name of this function, DecodeFrameNoDelay, is rather backwards
considering that it doesn't return the latest decoded frame immediately,
but actually does proper delaying and reordering of frames.

Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
Martin Storsjö 2019-01-25 10:28:46 +02:00
parent 28a8b5413b
commit eec93e5709
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/libopenh264dec.c
View File

@ -109,10 +109,18 @@ static int svc_decode_frame(AVCodecContext *avctx, void *data,
#endif
} else {
info.uiInBsTimeStamp = avpkt->pts;
#if OPENH264_VER_AT_LEAST(1, 4)
// Contrary to the name, DecodeFrameNoDelay actually does buffering
// and reordering of frames, and is the recommended decoding entry
// point since 1.4. This is essential for successfully decoding
// B-frames.
state = (*s->decoder)->DecodeFrameNoDelay(s->decoder, avpkt->data, avpkt->size, ptrs, &info);
#else
state = (*s->decoder)->DecodeFrame2(s->decoder, avpkt->data, avpkt->size, ptrs, &info);
#endif
}
if (state != dsErrorFree) {
av_log(avctx, AV_LOG_ERROR, "DecodeFrame2 failed\n");
av_log(avctx, AV_LOG_ERROR, "DecodeFrame failed\n");
return AVERROR_UNKNOWN;
}
if (info.iBufferStatus != 1) {