mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-09-02 18:23:56 +00:00
Code Issues 1 Projects Releases Wiki Activity

bin: Don't check twice for adding a bin to itself or removing it from itself

Browse source 
This is already covered by a `g_return_val_if_fail()` in the calling
function.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1320>
This commit is contained in:
Sebastian Dröge 2021-11-08 15:28:06 +02:00 committed by GStreamer Marge Bot
parent ddfd778c19
commit 79c4275ed4
1 changed files with 0 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
subprojects/gstreamer/gst/gstbin.c
View file

@ -1166,10 +1166,6 @@ gst_bin_add_func (GstBin * bin, GstElement * element)
GST_DEBUG_OBJECT (bin, "element :%s", GST_ELEMENT_NAME (element)); GST_DEBUG_OBJECT (bin, "element :%s", GST_ELEMENT_NAME (element));
/* we obviously can't add ourself to ourself */
if (G_UNLIKELY (element == GST_ELEMENT_CAST (bin)))
goto adding_itself;
/* get the element name to make sure it is unique in this bin. */ /* get the element name to make sure it is unique in this bin. */
GST_OBJECT_LOCK (element); GST_OBJECT_LOCK (element);
elem_name = g_strdup (GST_ELEMENT_NAME (element)); elem_name = g_strdup (GST_ELEMENT_NAME (element));
@ -1379,15 +1375,6 @@ no_state_recalc:
return TRUE; return TRUE;
/* ERROR handling here */ /* ERROR handling here */
adding_itself:
{
GST_OBJECT_LOCK (bin);
g_warning ("Cannot add bin '%s' to itself", GST_ELEMENT_NAME (bin));
GST_OBJECT_UNLOCK (bin);
gst_object_ref_sink (element);
gst_object_unref (element);
return FALSE;
}
duplicate_name: duplicate_name:
{ {
GST_OBJECT_UNLOCK (bin); GST_OBJECT_UNLOCK (bin);
@ -1575,10 +1562,6 @@ gst_bin_remove_func (GstBin * bin, GstElement * element)
GST_DEBUG_OBJECT (bin, "element :%s", GST_ELEMENT_NAME (element)); GST_DEBUG_OBJECT (bin, "element :%s", GST_ELEMENT_NAME (element));
/* we obviously can't remove ourself from ourself */
if (G_UNLIKELY (element == GST_ELEMENT_CAST (bin)))
goto removing_itself;
GST_OBJECT_LOCK (bin); GST_OBJECT_LOCK (bin);
GST_OBJECT_LOCK (element); GST_OBJECT_LOCK (element);
@ -1834,13 +1817,6 @@ no_state_recalc:
return TRUE; return TRUE;
/* ERROR handling */ /* ERROR handling */
removing_itself:
{
GST_OBJECT_LOCK (bin);
g_warning ("Cannot remove bin '%s' from itself", GST_ELEMENT_NAME (bin));
GST_OBJECT_UNLOCK (bin);
return FALSE;
}
not_in_bin: not_in_bin:
{ {
GST_OBJECT_UNLOCK (element); GST_OBJECT_UNLOCK (element);