diff options
| author | Thiago Santos <thiagoss@osg.samsung.com> | 2015-08-21 16:08:02 -0300 |
|---|---|---|
| committer | Thiago Santos <thiagoss@osg.samsung.com> | 2015-08-21 16:08:02 -0300 |
| commit | dc70f3ca60391b6e24799430eccc71b2b68feb17 (patch) | |
| tree | 03df8210bdfa06dfb8c61571314cb0ef7b241236 | |
| parent | 0d089f862345fdfc0fbe45dc168cae228be22832 (diff) | |
Revert "basetransform: respect accept-caps intersect flag"tracer-acceptcaps-reverted
This reverts commit 7ec54c2217ad1c1c00b616e9644d33902df802fb.
| -rw-r--r-- | libs/gst/base/gstbasetransform.c | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/libs/gst/base/gstbasetransform.c b/libs/gst/base/gstbasetransform.c index f6e0c0cbb..41b0fba72 100644 --- a/libs/gst/base/gstbasetransform.c +++ b/libs/gst/base/gstbasetransform.c @@ -1289,13 +1289,8 @@ gst_base_transform_acceptcaps_default (GstBaseTransform * trans, GstPad *otherpad; GstCaps *othercaps = NULL; #endif - GstPad *pad; gboolean ret = TRUE; - pad = - (direction == - GST_PAD_SINK) ? GST_BASE_TRANSFORM_SINK_PAD (trans) : - GST_BASE_TRANSFORM_SRC_PAD (trans); #if 0 otherpad = (pad == trans->srcpad) ? trans->sinkpad : trans->srcpad; @@ -1309,7 +1304,11 @@ gst_base_transform_acceptcaps_default (GstBaseTransform * trans, GST_DEBUG_OBJECT (trans, "accept caps %" GST_PTR_FORMAT, caps); /* get all the formats we can handle on this pad */ - allowed = gst_pad_query_caps (pad, caps); + if (direction == GST_PAD_SRC) + allowed = gst_pad_query_caps (trans->srcpad, caps); + else + allowed = gst_pad_query_caps (trans->sinkpad, caps); + if (!allowed) { GST_DEBUG_OBJECT (trans, "gst_pad_query_caps() failed"); goto no_transform_possible; @@ -1318,16 +1317,7 @@ gst_base_transform_acceptcaps_default (GstBaseTransform * trans, GST_DEBUG_OBJECT (trans, "allowed caps %" GST_PTR_FORMAT, allowed); /* intersect with the requested format */ - if (GST_PAD_IS_ACCEPT_INTERSECT (pad)) { - GST_DEBUG_OBJECT (pad, - "allowed caps intersect %" GST_PTR_FORMAT ", caps %" GST_PTR_FORMAT, - allowed, caps); - ret = gst_caps_can_intersect (caps, allowed); - } else { - GST_DEBUG_OBJECT (pad, "allowed caps subset %" GST_PTR_FORMAT ", caps %" - GST_PTR_FORMAT, allowed, caps); - ret = gst_caps_is_subset (caps, allowed); - } + ret = gst_caps_is_subset (caps, allowed); gst_caps_unref (allowed); if (!ret) |