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

utils: Handle iterator resyncs in gst_pad_proxy_setcaps()

Browse source 
Fixes bug #612881.
This commit is contained in:
Sebastian Dröge 2010-03-15 14:05:35 +01:00
parent f9c74afe62
commit fbbb671e54
1 changed files with 26 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
gst/gstutils.c
View file

@ -2756,10 +2756,10 @@ typedef struct
{ {
GstPad *orig; GstPad *orig;
GstCaps *caps; GstCaps *caps;
} LinkData; } SetCapsFoldData;
static gboolean static gboolean
setcaps_fold_func (GstPad * pad, GValue * ret, LinkData * data) setcaps_fold_func (GstPad * pad, GValue * ret, SetCapsFoldData * data)
{ {
gboolean success = TRUE; gboolean success = TRUE;
@ -2790,7 +2790,7 @@ gst_pad_proxy_setcaps (GstPad * pad, GstCaps * caps)
GstIterator *iter; GstIterator *iter;
GstIteratorResult res; GstIteratorResult res;
GValue ret = { 0, }; GValue ret = { 0, };
LinkData data; SetCapsFoldData data;
g_return_val_if_fail (GST_IS_PAD (pad), FALSE); g_return_val_if_fail (GST_IS_PAD (pad), FALSE);
g_return_val_if_fail (caps != NULL, FALSE); g_return_val_if_fail (caps != NULL, FALSE);
@ -2813,12 +2813,27 @@ gst_pad_proxy_setcaps (GstPad * pad, GstCaps * caps)
data.orig = pad; data.orig = pad;
data.caps = caps; data.caps = caps;
res = gst_iterator_fold (iter, (GstIteratorFoldFunction) setcaps_fold_func, while (1) {
&ret, &data); res = gst_iterator_fold (iter, (GstIteratorFoldFunction) setcaps_fold_func,
gst_iterator_free (iter); &ret, &data);
if (res != GST_ITERATOR_DONE) switch (res) {
goto pads_changed; case GST_ITERATOR_RESYNC:
/* reset return value */
g_value_set_boolean (&ret, TRUE);
gst_iterator_resync (iter);
break;
case GST_ITERATOR_DONE:
/* all pads iterated, return collected value */
goto done;
default:
/* iterator returned _ERROR or premature end with _OK,
* mark an error and exit */
goto error;
}
}
done:
gst_iterator_free (iter);
gst_object_unref (element); gst_object_unref (element);
@ -2826,10 +2841,11 @@ gst_pad_proxy_setcaps (GstPad * pad, GstCaps * caps)
return g_value_get_boolean (&ret); return g_value_get_boolean (&ret);
/* ERRORS */ /* ERRORS */
pads_changed: error:
{ {
g_warning ("Pad list changed during proxy_pad_link for element %s", g_warning ("Pad list return error on element %s",
GST_ELEMENT_NAME (element)); GST_ELEMENT_NAME (element));
gst_iterator_free (iter);
gst_object_unref (element); gst_object_unref (element);
return FALSE; return FALSE;
} }