mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

uvch264: do not double-unref if transform_caps fails

Browse source
This commit is contained in:
Youness Alaoui 2013-01-16 14:42:38 -05:00 committed by Olivier Crête
parent 410d0c0194
commit c9fbf274f4
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
sys/uvch264/gstuvch264_src.c
View file

@ -2187,6 +2187,7 @@ _transform_caps (GstUvcH264Src * self, GstCaps * caps, const gchar * name)
GstElement *cf = gst_element_factory_make ("capsfilter", NULL); GstElement *cf = gst_element_factory_make ("capsfilter", NULL);
GstElement *fs = gst_element_factory_make ("fakesink", NULL); GstElement *fs = gst_element_factory_make ("fakesink", NULL);
GstPad *sink; GstPad *sink;
GstCaps *out_caps = NULL;
if (!el || !cf || !fs || !gst_bin_add (GST_BIN (self), el)) { if (!el || !cf || !fs || !gst_bin_add (GST_BIN (self), el)) {
if (el) if (el)
@ -2210,6 +2211,8 @@ _transform_caps (GstUvcH264Src * self, GstCaps * caps, const gchar * name)
goto done; goto done;
} }
g_object_set (cf, "caps", caps, NULL);
if (!gst_element_link (cf, fs)) if (!gst_element_link (cf, fs))
goto error_remove; goto error_remove;
if (!gst_element_link (el, cf)) if (!gst_element_link (el, cf))
@ -2218,18 +2221,23 @@ _transform_caps (GstUvcH264Src * self, GstCaps * caps, const gchar * name)
sink = gst_element_get_static_pad (el, "sink"); sink = gst_element_get_static_pad (el, "sink");
if (!sink) if (!sink)
goto error_remove; goto error_remove;
g_object_set (cf, "caps", caps, NULL); GST_DEBUG_OBJECT (self, "Transforming: %" GST_PTR_FORMAT, caps);
caps = gst_pad_get_caps (sink); out_caps = gst_pad_get_caps (sink);
gst_object_unref (sink); gst_object_unref (sink);
GST_DEBUG_OBJECT (self, "Result: %" GST_PTR_FORMAT, out_caps);
error_remove: error_remove:
gst_bin_remove (GST_BIN (self), cf); gst_bin_remove (GST_BIN (self), cf);
gst_bin_remove (GST_BIN (self), el); gst_bin_remove (GST_BIN (self), el);
gst_bin_remove (GST_BIN (self), fs); gst_bin_remove (GST_BIN (self), fs);
done: done:
return caps; if (out_caps == NULL)
out_caps = gst_caps_copy (caps);
return out_caps;
} }
static GstCaps * static GstCaps *