mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-29 19:50:40 +00:00
Code Issues 1 Projects Releases Wiki Activity

ffmpegdec: avoid allocating and leaking local avpacket helpers

Browse source 
... by _init'ing them as locals rather than _new'ing them.

Fixes #653648.
This commit is contained in:
Mark Nauwelaerts 2011-06-29 16:22:48 +02:00
parent d9e60c1d5c
commit 856dbe6f21
1 changed files with 11 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
ext/ffmpeg/gstffmpegdec.c
View file

@ -1632,16 +1632,12 @@ flush_queued (GstFFMpegDec * ffmpegdec)
return res; return res;
} }
static AVPacket * static void
gst_avpacket_new (guint8 * data, guint size) gst_avpacket_init (AVPacket * packet, guint8 * data, guint size)
{ {
AVPacket *res; memset (packet, 0, sizeof (AVPacket));
packet->data = data;
res = g_malloc0 (sizeof (AVPacket)); packet->size = size;
res->data = data;
res->size = size;
return res;
} }
/* gst_ffmpegdec_[video|audio]_frame: /* gst_ffmpegdec_[video|audio]_frame:
@ -1671,7 +1667,7 @@ gst_ffmpegdec_video_frame (GstFFMpegDec * ffmpegdec,
GstClockTime out_timestamp, out_duration, out_pts; GstClockTime out_timestamp, out_duration, out_pts;
gint64 out_offset; gint64 out_offset;
const GstTSInfo *out_info; const GstTSInfo *out_info;
AVPacket *packet; AVPacket packet;
*ret = GST_FLOW_OK; *ret = GST_FLOW_OK;
*outbuf = NULL; *outbuf = NULL;
@ -1717,9 +1713,9 @@ gst_ffmpegdec_video_frame (GstFFMpegDec * ffmpegdec,
GST_DEBUG_OBJECT (ffmpegdec, "stored opaque values idx %d", dec_info->idx); GST_DEBUG_OBJECT (ffmpegdec, "stored opaque values idx %d", dec_info->idx);
/* now decode the frame */ /* now decode the frame */
packet = gst_avpacket_new (data, size); gst_avpacket_init (&packet, data, size);
len = avcodec_decode_video2 (ffmpegdec->context, len = avcodec_decode_video2 (ffmpegdec->context,
ffmpegdec->picture, &have_data, packet); ffmpegdec->picture, &have_data, &packet);
/* restore previous state */ /* restore previous state */
if (!decode) if (!decode)
@ -2071,7 +2067,7 @@ gst_ffmpegdec_audio_frame (GstFFMpegDec * ffmpegdec,
gint have_data = AVCODEC_MAX_AUDIO_FRAME_SIZE; gint have_data = AVCODEC_MAX_AUDIO_FRAME_SIZE;
GstClockTime out_timestamp, out_duration; GstClockTime out_timestamp, out_duration;
gint64 out_offset; gint64 out_offset;
AVPacket *packet; AVPacket packet;
GST_DEBUG_OBJECT (ffmpegdec, GST_DEBUG_OBJECT (ffmpegdec,
"size:%d, offset:%" G_GINT64_FORMAT ", ts:%" GST_TIME_FORMAT ", dur:%" "size:%d, offset:%" G_GINT64_FORMAT ", ts:%" GST_TIME_FORMAT ", dur:%"
@ -2083,9 +2079,9 @@ gst_ffmpegdec_audio_frame (GstFFMpegDec * ffmpegdec,
new_aligned_buffer (AVCODEC_MAX_AUDIO_FRAME_SIZE, new_aligned_buffer (AVCODEC_MAX_AUDIO_FRAME_SIZE,
GST_PAD_CAPS (ffmpegdec->srcpad)); GST_PAD_CAPS (ffmpegdec->srcpad));
packet = gst_avpacket_new (data, size); gst_avpacket_init (&packet, data, size);
len = avcodec_decode_audio3 (ffmpegdec->context, len = avcodec_decode_audio3 (ffmpegdec->context,
(int16_t *) GST_BUFFER_DATA (*outbuf), &have_data, packet); (int16_t *) GST_BUFFER_DATA (*outbuf), &have_data, &packet);
GST_DEBUG_OBJECT (ffmpegdec, GST_DEBUG_OBJECT (ffmpegdec,
"Decode audio: len=%d, have_data=%d", len, have_data); "Decode audio: len=%d, have_data=%d", len, have_data);