From: Aman Gupta <a...@tmm1.net>
This allows decode_slice to be invoked multiple times before end_frame,
causing slices to accumulate before being fed into the VT decoder.
An upcoming commit will re-use decode_slice for SPS and PPS nalus, so
they can be propagated into the VT decoder session along with slide
data.
---
libavcodec/videotoolbox.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/libavcodec/videotoolbox.c b/libavcodec/videotoolbox.c
index 24f74ee86e..a4a282c33a 100644
--- a/libavcodec/videotoolbox.c
+++ b/libavcodec/videotoolbox.c
@@ -300,8 +300,6 @@ int ff_videotoolbox_h264_start_frame(AVCodecContext *avctx,
VTContext *vtctx = avctx->internal->hwaccel_priv_data;
H264Context *h = avctx->priv_data;
- vtctx->bitstream_size = 0;
-
if (h->is_avc == 1) {
return videotoolbox_buffer_copy(vtctx, buffer, size);
}
@@ -600,8 +598,10 @@ static int videotoolbox_h264_end_frame(AVCodecContext
*avctx)
{
H264Context *h = avctx->priv_data;
AVFrame *frame = h->cur_pic_ptr->f;
-
- return videotoolbox_common_end_frame(avctx, frame);
+ VTContext *vtctx = avctx->internal->hwaccel_priv_data;
+ int ret = videotoolbox_common_end_frame(avctx, frame);
+ vtctx->bitstream_size = 0;
+ return ret;
}
static int videotoolbox_hevc_end_frame(AVCodecContext *avctx)
--
2.14.2
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
