From b4c2d8c1bb8c31a9f1d3f86ed92cbb6e1e12be2a Mon Sep 17 00:00:00 2001 From: Michael Smith Date: Tue, 10 Feb 2009 16:22:54 -0800 Subject: 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. --- gst/selector/gstinputselector.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/gst/selector/gstinputselector.c b/gst/selector/gstinputselector.c index 165d1f60..7fc43686 100644 --- a/gst/selector/gstinputselector.c +++ b/gst/selector/gstinputselector.c @@ -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, ¬ify); - /* 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; } -- cgit v1.2.1