mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-26 11:41:09 +00:00
Code Issues 1 Projects Releases Wiki Activity

gesbasebin: Fix a couple leaks

Browse source 
Also clean-up unused queue when we failed to link a track to it.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5981>
This commit is contained in:
Philippe Normand 2023-10-03 14:45:35 +01:00 committed by GStreamer Marge Bot
parent ff9fec521b
commit 20340e71f2
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
subprojects/gst-editing-services/plugins/ges/gesbasebin.c
View file

@ -321,7 +321,12 @@ ges_base_bin_set_timeline (GESBaseBin * self, GESTimeline * timeline)
/* Add queues the same way as in GESPipeline */ /* Add queues the same way as in GESPipeline */
g_object_set (G_OBJECT (queue), "max-size-buffers", 0, g_object_set (G_OBJECT (queue), "max-size-buffers", 0,
"max-size-bytes", 0, "max-size-time", (gint64) 2 * GST_SECOND, NULL); "max-size-bytes", 0, "max-size-time", (gint64) 2 * GST_SECOND, NULL);
gst_bin_add (sbin, queue); if (!gst_bin_add (sbin, queue)) {
g_free (name);
gst_object_unref (queue);
continue;
}
gst_element_sync_state_with_parent (GST_ELEMENT (queue)); gst_element_sync_state_with_parent (GST_ELEMENT (queue));
tmppad = gst_element_get_static_pad (queue, "sink"); tmppad = gst_element_get_static_pad (queue, "sink");
@ -329,14 +334,18 @@ ges_base_bin_set_timeline (GESBaseBin * self, GESTimeline * timeline)
GST_ERROR_OBJECT (sbin, "Could not link %s:%s and %s:%s", GST_ERROR_OBJECT (sbin, "Could not link %s:%s and %s:%s",
GST_DEBUG_PAD_NAME (pad), GST_DEBUG_PAD_NAME (tmppad)); GST_DEBUG_PAD_NAME (pad), GST_DEBUG_PAD_NAME (tmppad));
g_free (name);
gst_object_unref (tmppad); gst_object_unref (tmppad);
gst_object_unref (queue); gst_bin_remove (sbin, queue);
continue; continue;
} }
gst_object_unref (tmppad);
tmppad = gst_element_get_static_pad (queue, "src"); tmppad = gst_element_get_static_pad (queue, "src");
gpad = gst_ghost_pad_new_from_template (name, tmppad, gpad = gst_ghost_pad_new_from_template (name, tmppad,
gst_static_pad_template_get (template)); gst_static_pad_template_get (template));
gst_object_unref (tmppad);
g_free (name);
gst_pad_set_active (gpad, TRUE); gst_pad_set_active (gpad, TRUE);
gst_element_add_pad (GST_ELEMENT (sbin), gpad); gst_element_add_pad (GST_ELEMENT (sbin), gpad);