mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-03 17:22:29 +00:00
Code Issues 1 Projects Releases Wiki Activity

pad: notify caps after we store the new caps

Browse source 
notify caps after we store the new caps so that the new caps are actually
visible for the app.
This commit is contained in:
Wim Taymans 2011-06-21 10:29:51 +02:00
parent 69409f1ec8
commit de3b6e733f
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
gst/gstpad.c
View file

@ -2695,7 +2695,7 @@ gst_pad_set_caps (GstPad * pad, GstCaps * caps)
static gboolean
do_event_function (GstPad * pad, GstEvent * event,
GstPadEventFunction eventfunc)
GstPadEventFunction eventfunc, gboolean * caps_notify)
{
gboolean result = TRUE;
GstCaps *caps, *templ;
@ -2711,7 +2711,7 @@ do_event_function (GstPad * pad, GstEvent * event,
if (!gst_caps_can_intersect (caps, templ))
goto not_accepted;
g_object_notify_by_pspec ((GObject *) pad, pspec_caps);
*caps_notify = TRUE;
gst_caps_unref (templ);
break;
@ -2747,6 +2747,7 @@ gst_pad_update_events (GstPad * pad)
guint i;
GstPadEventFunction eventfunc;
GstEvent *event;
gboolean caps_notify = FALSE;
if (G_UNLIKELY ((eventfunc = GST_PAD_EVENTFUNC (pad)) == NULL))
goto no_function;
@ -2764,9 +2765,8 @@ gst_pad_update_events (GstPad * pad)
gst_event_ref (event);
GST_OBJECT_UNLOCK (pad);
res = do_event_function (pad, event, eventfunc);
res = do_event_function (pad, event, eventfunc, &caps_notify);
GST_OBJECT_LOCK (pad);
/* things could have changed while we release the lock, check if we still
* are handling the same event, if we don't something changed and we have
* to try again. FIXME. we need a cookie here. FIXME, we also want to remove
@ -2775,13 +2775,19 @@ gst_pad_update_events (GstPad * pad)
if (res) {
/* make the event active */
gst_event_take (&ev->event, event);
/* notify caps change when needed */
if (caps_notify) {
g_object_notify_by_pspec ((GObject *) pad, pspec_caps);
caps_notify = FALSE;
}
} else {
gst_event_unref (event);
ret = GST_FLOW_ERROR;
}
GST_OBJECT_LOCK (pad);
}
/* when we get here all events were successfully updated. */
return ret;
/* ERRORS */