From: Thiago Santos <thiagoss@osg.samsung.com>
Date: Thu, 14 Aug 2014 21:53:40 +0000 (-0300)
Subject: inputselector: always proxy caps query
X-Git-Tag: 1.4.1~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ffa14610cadade78165d3d161780fde5704d910d;p=platform%2Fupstream%2Fgstreamer.git

inputselector: always proxy caps query

Otherwise it would only be proxied for the active pad which can lead
upstream to use an incompatible caps for the downstream element.

Even if a reconfigure event is sent upstream when the pad is activated, this
will save the caps reconfiguration if it is already using an acceptable caps.
---

diff --git a/plugins/elements/gstinputselector.c b/plugins/elements/gstinputselector.c
index 45db79bd8a..fb50802516 100644
--- a/plugins/elements/gstinputselector.c
+++ b/plugins/elements/gstinputselector.c
@@ -588,8 +588,13 @@ static gboolean
 gst_selector_pad_query (GstPad * pad, GstObject * parent, GstQuery * query)
 {
   gboolean res = FALSE;
+  GstInputSelector *self = (GstInputSelector *) parent;
 
   switch (GST_QUERY_TYPE (query)) {
+    case GST_QUERY_CAPS:
+      /* always proxy caps query, regardless of active pad or not */
+      res = gst_pad_peer_query (self->srcpad, query);
+      break;
     case GST_QUERY_ALLOCATION:{
       GstPad *active_sinkpad;
       GstInputSelector *sel = GST_INPUT_SELECTOR (parent);