mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 04:01:08 +00:00
Code Issues 1 Projects Releases Wiki Activity

avviddec: Fix huge leak caused by circular reference

Browse source 
AVBufferRef -> GstFFMpegVideoDecVideoFrame -> GstVideoCodecFrame -> AVBufferRef

Instead of holding additional ref there, set read-only which would not be
reused by ff_reget_buffer()

Fixes: https://gitlab.freedesktop.org/gstreamer/gst-libav/issues/63
This commit is contained in:
Seungha Yang 2019-10-29 11:43:05 +09:00
parent 30d0674e7d
commit 07f33470b3
1 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
ext/libav/gstavviddec.c
View file

@ -773,12 +773,6 @@ gst_ffmpegviddec_can_direct_render (GstFFMpegVidDec * ffmpegdec)
AV_CODEC_CAP_DR1); AV_CODEC_CAP_DR1);
} }
static void
gst_ffmpegviddec_avbuffer_unref (AVBufferRef * avbuffer)
{
av_buffer_unref (&avbuffer);
}
/* called when ffmpeg wants us to allocate a buffer to write the decoded frame /* called when ffmpeg wants us to allocate a buffer to write the decoded frame
* into. We try to give it memory from our pool */ * into. We try to give it memory from our pool */
static int static int
@ -790,6 +784,7 @@ gst_ffmpegviddec_get_buffer2 (AVCodecContext * context, AVFrame * picture,
GstFFMpegVidDec *ffmpegdec; GstFFMpegVidDec *ffmpegdec;
guint c; guint c;
GstFlowReturn ret; GstFlowReturn ret;
int create_buffer_flags = 0;
ffmpegdec = (GstFFMpegVidDec *) context->opaque; ffmpegdec = (GstFFMpegVidDec *) context->opaque;
@ -871,17 +866,16 @@ gst_ffmpegviddec_get_buffer2 (AVCodecContext * context, AVFrame * picture,
picture->data[c]); picture->data[c]);
} }
picture->buf[0] = av_buffer_create (NULL, 0, dummy_free_buffer, dframe, 0);
if ((flags & AV_GET_BUFFER_FLAG_REF) == AV_GET_BUFFER_FLAG_REF) { if ((flags & AV_GET_BUFFER_FLAG_REF) == AV_GET_BUFFER_FLAG_REF) {
/* decoder might reuse this AVFrame and it would result to no more /* decoder might reuse this AVFrame and it would result to no more
* get_buffer() call if the AVFrame's AVBuffer is writable * get_buffer() call if the AVFrame's AVBuffer is writable
* (meaning that the refcount of AVBuffer == 1). * (meaning that the refcount of AVBuffer == 1).
* To enforce get_buffer() for the every output frame, hold another ref here * To enforce get_buffer() for the every output frame, set read-only flag here
*/ */
gst_video_codec_frame_set_user_data (frame, create_buffer_flags = AV_BUFFER_FLAG_READONLY;
av_buffer_ref (picture->buf[0]),
(GDestroyNotify) gst_ffmpegviddec_avbuffer_unref);
} }
picture->buf[0] = av_buffer_create (NULL,
0, dummy_free_buffer, dframe, create_buffer_flags);
GST_LOG_OBJECT (ffmpegdec, "returned frame %p", dframe->buffer); GST_LOG_OBJECT (ffmpegdec, "returned frame %p", dframe->buffer);