virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
Code Issues Releases Activity

Merge commit 'e1e3a12242347dd11174b2fb9ddac8dc8df16224'

Browse Source 
* commit 'e1e3a12242347dd11174b2fb9ddac8dc8df16224':
  libopenh264: Add support for decoding of b-frames

Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2018-09-02 19:26:00 -03:00
commit 022fa7a24e
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libavcodec/libopenh264dec.c
View File

@ -96,7 +96,18 @@ static int svc_decode_frame(AVCodecContext *avctx, void *data,
AVFrame *avframe = data;
DECODING_STATE state;
state = (*s->decoder)->DecodeFrame2(s->decoder, avpkt->data, avpkt->size, ptrs, &info);
if (!avpkt->data) {
#if OPENH264_VER_AT_LEAST(1, 9)
int end_of_stream = 1;
(*s->decoder)->SetOption(s->decoder, DECODER_OPTION_END_OF_STREAM, &end_of_stream);
state = (*s->decoder)->FlushFrame(s->decoder, ptrs, &info);
#else
return 0;
#endif
} else {
info.uiInBsTimeStamp = avpkt->pts;
state = (*s->decoder)->DecodeFrame2(s->decoder, avpkt->data, avpkt->size, ptrs, &info);
}
if (state != dsErrorFree) {
av_log(avctx, AV_LOG_ERROR, "DecodeFrame2 failed\n");
return AVERROR_UNKNOWN;
@ -120,8 +131,8 @@ static int svc_decode_frame(AVCodecContext *avctx, void *data,
linesize[1] = linesize[2] = info.UsrData.sSystemBuffer.iStride[1];
av_image_copy(avframe->data, avframe->linesize, (const uint8_t **) ptrs, linesize, avctx->pix_fmt, avctx->width, avctx->height);
avframe->pts = avpkt->pts;
avframe->pkt_dts = avpkt->dts;
avframe->pts = info.uiOutYuvTimeStamp;
avframe->pkt_dts = AV_NOPTS_VALUE;
#if FF_API_PKT_PTS
FF_DISABLE_DEPRECATION_WARNINGS
avframe->pkt_pts = avpkt->pts;
@ -141,8 +152,6 @@ AVCodec ff_libopenh264_decoder = {
.init = svc_decode_init,
.decode = svc_decode_frame,
.close = svc_decode_close,
// The decoder doesn't currently support B-frames, and the decoder's API
// doesn't support reordering/delay, but the BSF could incur delay.
.capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_DR1,
.caps_internal = FF_CODEC_CAP_SETS_PKT_DTS | FF_CODEC_CAP_INIT_THREADSAFE |
FF_CODEC_CAP_INIT_CLEANUP,