input-selector: Activate and notify pad before processing events.

Events should trigger pad selection if we don't already have an
explicitly selected pad, so that events prior to first buffer don't get
lost.
This commit is contained in:
Michael Smith 2009-02-10 16:22:54 -08:00
parent ff2d0621f7
commit b4c2d8c1bb

View file

@ -342,17 +342,23 @@ gst_selector_pad_event (GstPad * pad, GstEvent * event)
gboolean forward = TRUE;
GstInputSelector *sel;
GstSelectorPad *selpad;
GstPad *active_sinkpad;
gboolean notify;
sel = GST_INPUT_SELECTOR (gst_pad_get_parent (pad));
selpad = GST_SELECTOR_PAD_CAST (pad);
/* only forward if we are dealing with the active sinkpad */
forward = gst_input_selector_is_active_sinkpad (sel, pad);
GST_INPUT_SELECTOR_LOCK (sel);
active_sinkpad = gst_input_selector_activate_sinkpad (sel, pad, &notify);
/* forward all events in select_all mode by default */
if (sel->select_all) {
forward = TRUE;
}
/* only forward if we are dealing with the active sinkpad or if select_all
* is enabled */
if (pad != active_sinkpad && !sel->select_all)
forward = FALSE;
GST_INPUT_SELECTOR_UNLOCK (sel);
if (notify)
g_object_notify (G_OBJECT (sel), "active-pad");
switch (GST_EVENT_TYPE (event)) {
case GST_EVENT_FLUSH_START:
@ -1037,8 +1043,7 @@ gst_input_selector_event (GstPad * pad, GstEvent * event)
res = gst_pad_push_event (otherpad, event);
gst_object_unref (otherpad);
}
else
} else
gst_event_unref (event);
return res;
}