mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-12 10:25:33 +00:00
Code Issues 1 Projects Releases Wiki Activity

rtpvrawdepay: don't shadow existing outbuf variable

Browse source 
And fix unref of the wrong one which will contain NULL
in an error code path.
This commit is contained in:
Tim-Philipp Müller 2015-05-23 13:47:17 +01:00
parent 2aafb3951d
commit 80998dadba
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
gst/rtp/gstrtpvrawdepay.c
View file

@ -336,7 +336,7 @@ gst_rtp_vraw_depay_process (GstRTPBaseDepayload * depayload, GstBuffer * buf)
timestamp = gst_rtp_buffer_get_timestamp (&rtp); timestamp = gst_rtp_buffer_get_timestamp (&rtp);
if (timestamp != rtpvrawdepay->timestamp || rtpvrawdepay->outbuf == NULL) { if (timestamp != rtpvrawdepay->timestamp || rtpvrawdepay->outbuf == NULL) {
GstBuffer *outbuf; GstBuffer *new_buffer;
GstFlowReturn ret; GstFlowReturn ret;
GST_LOG_OBJECT (depayload, "new frame with timestamp %u", timestamp); GST_LOG_OBJECT (depayload, "new frame with timestamp %u", timestamp);
@ -357,18 +357,22 @@ gst_rtp_vraw_depay_process (GstRTPBaseDepayload * depayload, GstBuffer * buf)
gst_caps_unref (caps); gst_caps_unref (caps);
} }
ret = gst_buffer_pool_acquire_buffer (rtpvrawdepay->pool, &outbuf, NULL); ret =
gst_buffer_pool_acquire_buffer (rtpvrawdepay->pool, &new_buffer, NULL);
if (G_UNLIKELY (ret != GST_FLOW_OK)) if (G_UNLIKELY (ret != GST_FLOW_OK))
goto alloc_failed; goto alloc_failed;
/* clear timestamp from alloc... */ /* clear timestamp from alloc... */
GST_BUFFER_TIMESTAMP (outbuf) = -1; GST_BUFFER_TIMESTAMP (new_buffer) = -1;
if (!gst_video_frame_map (&rtpvrawdepay->frame, &rtpvrawdepay->vinfo, if (!gst_video_frame_map (&rtpvrawdepay->frame, &rtpvrawdepay->vinfo,
outbuf, GST_MAP_WRITE | GST_VIDEO_FRAME_MAP_FLAG_NO_REF)) new_buffer, GST_MAP_WRITE | GST_VIDEO_FRAME_MAP_FLAG_NO_REF)) {
gst_buffer_unref (new_buffer);
goto invalid_frame; goto invalid_frame;
}
rtpvrawdepay->outbuf = outbuf; rtpvrawdepay->outbuf = new_buffer;
rtpvrawdepay->timestamp = timestamp; rtpvrawdepay->timestamp = timestamp;
} }
@ -585,7 +589,6 @@ alloc_failed:
invalid_frame: invalid_frame:
{ {
GST_ERROR_OBJECT (depayload, "could not map video frame"); GST_ERROR_OBJECT (depayload, "could not map video frame");
gst_buffer_unref (outbuf);
return NULL; return NULL;
} }
wrong_length: wrong_length: