mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-01 06:01:04 +00:00
Code Issues 1 Projects Releases Wiki Activity

bin: Make sure to resync iterators and handle RESYNC at all in gst_iterator_foreach() calls

Browse source
This commit is contained in:
Sebastian Dröge 2016-12-01 18:20:11 +02:00
parent 160ca37139
commit 78e485b314
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
gst/gstbin.c
View file

@ -1143,6 +1143,8 @@ gst_bin_do_deep_add_remove (GstBin * bin, gint sig_id, const gchar * sig_name,
g_queue_foreach (&elements, (GFunc) g_object_unref, NULL); g_queue_foreach (&elements, (GFunc) g_object_unref, NULL);
g_queue_clear (&elements); g_queue_clear (&elements);
} }
if (ires == GST_ITERATOR_RESYNC)
gst_iterator_resync (it);
} while (ires == GST_ITERATOR_RESYNC); } while (ires == GST_ITERATOR_RESYNC);
if (ires != GST_ITERATOR_ERROR) { if (ires != GST_ITERATOR_ERROR) {
GstElement *e; GstElement *e;
@ -1368,7 +1370,9 @@ no_state_recalc:
/* unlink all linked pads */ /* unlink all linked pads */
it = gst_element_iterate_pads (element); it = gst_element_iterate_pads (element);
gst_iterator_foreach (it, (GstIteratorForeachFunction) unlink_pads, NULL); while (gst_iterator_foreach (it, (GstIteratorForeachFunction) unlink_pads,
NULL) == GST_ITERATOR_RESYNC)
gst_iterator_resync (it);
gst_iterator_free (it); gst_iterator_free (it);
GST_CAT_DEBUG_OBJECT (GST_CAT_PARENTAGE, bin, "added element \"%s\"", GST_CAT_DEBUG_OBJECT (GST_CAT_PARENTAGE, bin, "added element \"%s\"",
@ -1809,7 +1813,9 @@ no_state_recalc:
/* unlink all linked pads */ /* unlink all linked pads */
it = gst_element_iterate_pads (element); it = gst_element_iterate_pads (element);
gst_iterator_foreach (it, (GstIteratorForeachFunction) unlink_pads, NULL); while (gst_iterator_foreach (it, (GstIteratorForeachFunction) unlink_pads,
NULL) == GST_ITERATOR_RESYNC)
gst_iterator_resync (it);
gst_iterator_free (it); gst_iterator_free (it);
GST_CAT_INFO_OBJECT (GST_CAT_PARENTAGE, bin, "removed child \"%s\"", GST_CAT_INFO_OBJECT (GST_CAT_PARENTAGE, bin, "removed child \"%s\"",