mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-30 05:31:15 +00:00
Code Issues 1 Projects Releases Wiki Activity

avvidenc: Fix leak of AVBufferRef

Browse source 
AVPacket contains AVBufferRef which may leak unless unreffed properly.

https://bugzilla.gnome.org/show_bug.cgi?id=726814
This commit is contained in:
Stian Selnes 2014-03-21 10:10:14 +01:00 committed by Sebastian Dröge
parent 3a81f604fe
commit 245be56510
1 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
ext/libav/gstavvidenc.c
View file

@ -542,6 +542,13 @@ gst_ffmpegvidenc_propose_allocation (GstVideoEncoder * encoder,
query); query);
} }
static void
gst_ffmpegvidenc_free_avpacket (gpointer pkt)
{
av_packet_unref ((AVPacket *)pkt);
g_slice_free (AVPacket, pkt);
}
static GstFlowReturn static GstFlowReturn
gst_ffmpegvidenc_handle_frame (GstVideoEncoder * encoder, gst_ffmpegvidenc_handle_frame (GstVideoEncoder * encoder,
GstVideoCodecFrame * frame) GstVideoCodecFrame * frame)
@ -551,7 +558,7 @@ gst_ffmpegvidenc_handle_frame (GstVideoEncoder * encoder,
gint ret = 0, c; gint ret = 0, c;
GstVideoInfo *info = &ffmpegenc->input_state->info; GstVideoInfo *info = &ffmpegenc->input_state->info;
GstVideoFrame vframe; GstVideoFrame vframe;
AVPacket pkt; AVPacket * pkt;
int have_data = 0; int have_data = 0;
if (GST_VIDEO_CODEC_FRAME_IS_FORCE_KEYFRAME (frame)) if (GST_VIDEO_CODEC_FRAME_IS_FORCE_KEYFRAME (frame))
@ -579,14 +586,17 @@ gst_ffmpegvidenc_handle_frame (GstVideoEncoder * encoder,
ffmpegenc->context->ticks_per_frame, ffmpegenc->context->time_base); ffmpegenc->context->ticks_per_frame, ffmpegenc->context->time_base);
have_data = 0; have_data = 0;
memset (&pkt, 0, sizeof (pkt)); pkt = g_slice_new0 (AVPacket);
ret = ret =
avcodec_encode_video2 (ffmpegenc->context, &pkt, ffmpegenc->picture, avcodec_encode_video2 (ffmpegenc->context, pkt, ffmpegenc->picture,
&have_data); &have_data);
gst_video_frame_unmap (&vframe); gst_video_frame_unmap (&vframe);
if (ret < 0 || !have_data)
g_slice_free (AVPacket, pkt);
if (ret < 0) if (ret < 0)
goto encode_fail; goto encode_fail;
@ -607,8 +617,8 @@ gst_ffmpegvidenc_handle_frame (GstVideoEncoder * encoder,
frame = gst_video_encoder_get_oldest_frame (encoder); frame = gst_video_encoder_get_oldest_frame (encoder);
outbuf = outbuf =
gst_buffer_new_wrapped_full (0, pkt.data, pkt.size, 0, pkt.size, pkt.data, gst_buffer_new_wrapped_full (0, pkt->data, pkt->size, 0, pkt->size, pkt,
av_free); gst_ffmpegvidenc_free_avpacket);
frame->output_buffer = outbuf; frame->output_buffer = outbuf;
/* buggy codec may not set coded_frame */ /* buggy codec may not set coded_frame */