mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-16 13:26:36 +00:00
Code Issues 1 Projects Releases Wiki Activity

avdec: handle_frame should always unref the input frame

Browse source 
Unref the input frame in all cases. Previously it was only unreffed when the
frame was used for output.
When we produce an output frame, take an extra ref because the frame is now
freed elsewhere.
This commit is contained in:
Wim Taymans 2012-07-03 17:05:17 +02:00
parent c9878e9f86
commit cdcaa584a4
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ext/ffmpeg/gstffmpegviddec.c
View file

@ -1091,7 +1091,7 @@ gst_ffmpegviddec_video_frame (GstFFMpegVidDec * ffmpegdec,
/* get the output picture timing info again */ /* get the output picture timing info again */
out_dframe = ffmpegdec->picture->opaque; out_dframe = ffmpegdec->picture->opaque;
out_frame = out_dframe->frame; out_frame = gst_video_codec_frame_ref (out_dframe->frame);
GST_DEBUG_OBJECT (ffmpegdec, GST_DEBUG_OBJECT (ffmpegdec,
"pts %" G_GUINT64_FORMAT " duration %" G_GUINT64_FORMAT, "pts %" G_GUINT64_FORMAT " duration %" G_GUINT64_FORMAT,
@ -1138,7 +1138,8 @@ gst_ffmpegviddec_video_frame (GstFFMpegVidDec * ffmpegdec,
gst_video_decoder_finish_frame (GST_VIDEO_DECODER (ffmpegdec), out_frame); gst_video_decoder_finish_frame (GST_VIDEO_DECODER (ffmpegdec), out_frame);
beach: beach:
GST_DEBUG_OBJECT (ffmpegdec, "return flow %d, len %d", *ret, len); GST_DEBUG_OBJECT (ffmpegdec, "return flow %s, len %d",
gst_flow_get_name (*ret), len);
return len; return len;
/* special cases */ /* special cases */
@ -1352,6 +1353,7 @@ gst_ffmpegviddec_handle_frame (GstVideoDecoder * decoder,
GST_DEBUG_OBJECT (ffmpegdec, "Dropping %d bytes of data", bsize); GST_DEBUG_OBJECT (ffmpegdec, "Dropping %d bytes of data", bsize);
gst_buffer_unmap (frame->input_buffer, &minfo); gst_buffer_unmap (frame->input_buffer, &minfo);
gst_video_codec_frame_unref (frame);
return ret; return ret;
} }
@ -1448,8 +1450,8 @@ gst_ffmpegviddec_decide_allocation (GstVideoDecoder * decoder, GstQuery * query)
avcodec_align_dimensions2 (ffmpegdec->context, &width, &height, avcodec_align_dimensions2 (ffmpegdec->context, &width, &height,
linesize_align); linesize_align);
edge = edge =
ffmpegdec-> ffmpegdec->context->
context->flags & CODEC_FLAG_EMU_EDGE ? 0 : avcodec_get_edge_width (); flags & CODEC_FLAG_EMU_EDGE ? 0 : avcodec_get_edge_width ();
/* increase the size for the padding */ /* increase the size for the padding */
width += edge << 1; width += edge << 1;
height += edge << 1; height += edge << 1;