From 9747219958060d8c4f697df62e7f172c2a77e6c7 Mon Sep 17 00:00:00 2001
From: wm4 <nfxjfg@googlemail.com>
Date: Fri, 20 Nov 2015 11:30:18 +0100
Subject: [PATCH] avcodec/h264, videotoolbox: do not return invalid frames on
failure
If videotoolbox_common_end_frame failed, then the AVFrame was returned
to the API user with the dummy buffer (in AVFrame.buf[0]) still set, and
the decode call indicating success.
These "half-set" AVFrames with dummy buffer are a videotoolbox specific
hack, because the decoder requires an allocated AVFrame for its internal
logic. Videotoolbox on the other hand allocates its frame itself
internally, and outputs it only on end_frame. At this point, the dummy
buffer is replaced with the real frame (unless decoding fails).
---
libavcodec/h264_refs.c | 3 ++-
libavcodec/videotoolbox.c | 2 ++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/libavcodec/h264_refs.c b/libavcodec/h264_refs.c
index 619f2edf844..9d0641a0dbe 100644
--- a/libavcodec/h264_refs.c
+++ b/libavcodec/h264_refs.c
@@ -515,7 +515,8 @@ void ff_h264_remove_all_refs(H264Context *h)
if (h->short_ref_count && !h->last_pic_for_ec.f->data[0]) {
ff_h264_unref_picture(h, &h->last_pic_for_ec);
- ff_h264_ref_picture(h, &h->last_pic_for_ec, h->short_ref[0]);
+ if (h->short_ref[0]->f->buf[0])
+ ff_h264_ref_picture(h, &h->last_pic_for_ec, h->short_ref[0]);
}
for (i = 0; i < h->short_ref_count; i++) {
diff --git a/libavcodec/videotoolbox.c b/libavcodec/videotoolbox.c
index cc1e592ac9a..2f4d5316015 100644
--- a/libavcodec/videotoolbox.c
+++ b/libavcodec/videotoolbox.c
@@ -353,6 +353,8 @@ static int videotoolbox_common_end_frame(AVCodecContext *avctx, AVFrame *frame)
AVVideotoolboxContext *videotoolbox = avctx->hwaccel_context;
VTContext *vtctx = avctx->internal->hwaccel_priv_data;
+ av_buffer_unref(&frame->buf[0]);
+
if (!videotoolbox->session || !vtctx->bitstream)
return AVERROR_INVALIDDATA;
--
GitLab