mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 05:16:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

inputselector: Only proxy the allocation query for the active pad and send reconfigure events to the old/new pad when switching pads

Browse source
This commit is contained in:
Sebastian Dröge 2012-06-19 10:32:10 +01:00
parent 61fefbb542
commit 7b966e4577
1 changed files with 26 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
plugins/elements/gstinputselector.c
View file

@ -575,11 +575,32 @@ gst_selector_pad_query (GstPad * pad, GstObject * parent, GstQuery * query)
gboolean res = FALSE; gboolean res = FALSE;
switch (GST_QUERY_TYPE (query)) { switch (GST_QUERY_TYPE (query)) {
case GST_QUERY_ALLOCATION:{
GstPad *active_sinkpad;
GstInputSelector *sel = GST_INPUT_SELECTOR (parent);
/* Only do the allocation query for the active sinkpad,
* after switching a reconfigure event is sent and upstream
* should reconfigure and do a new allocation query
*/
if (GST_PAD_DIRECTION (pad) == GST_PAD_SINK) {
GST_INPUT_SELECTOR_LOCK (sel);
active_sinkpad = gst_input_selector_activate_sinkpad (sel, pad);
GST_INPUT_SELECTOR_UNLOCK (sel);
if (pad != active_sinkpad) {
res = FALSE;
goto done;
}
}
}
/* fall through */
default: default:
res = gst_pad_query_default (pad, parent, query); res = gst_pad_query_default (pad, parent, query);
break; break;
} }
done:
return res; return res;
} }
@ -1328,6 +1349,11 @@ gst_input_selector_set_active_pad (GstInputSelector * self, GstPad * pad)
active_pad_p = &self->active_sinkpad; active_pad_p = &self->active_sinkpad;
gst_object_replace ((GstObject **) active_pad_p, GST_OBJECT_CAST (pad)); gst_object_replace ((GstObject **) active_pad_p, GST_OBJECT_CAST (pad));
if (old && old != new)
gst_pad_push_event (GST_PAD_CAST (old), gst_event_new_reconfigure ());
if (new)
gst_pad_push_event (GST_PAD_CAST (new), gst_event_new_reconfigure ());
GST_DEBUG_OBJECT (self, "New active pad is %" GST_PTR_FORMAT, GST_DEBUG_OBJECT (self, "New active pad is %" GST_PTR_FORMAT,
self->active_sinkpad); self->active_sinkpad);