From 1f1fe47cb6c52d1017d00c407fb8cb29ff3bb26b Mon Sep 17 00:00:00 2001 From: Stefan Sauer Date: Mon, 4 Feb 2013 11:08:23 +0100 Subject: [PATCH] audiopanorama: further port to 1.0 Transformcaps is not called with caps containing single structures anymore. Also add missing filter handling. Still does not negotiate though. --- gst/audiofx/audiopanorama.c | 35 ++++++++++++++++++++++++----------- 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/gst/audiofx/audiopanorama.c b/gst/audiofx/audiopanorama.c index 3c41b7e..89b57e2 100644 --- a/gst/audiofx/audiopanorama.c +++ b/gst/audiofx/audiopanorama.c @@ -326,19 +326,32 @@ gst_audio_panorama_transform_caps (GstBaseTransform * base, { GstCaps *res; GstStructure *structure; + gint i; - /* transform caps gives one single caps so we can just replace - * the channel property with our range. */ + /* replace the channel property with our range. */ res = gst_caps_copy (caps); - structure = gst_caps_get_structure (res, 0); - if (direction == GST_PAD_SRC) { - GST_INFO ("allow 1-2 channels"); - gst_structure_set (structure, "channels", GST_TYPE_INT_RANGE, 1, 2, NULL); - gst_structure_remove_field (structure, "channel-mask"); - } else { - GST_INFO ("allow 2 channels"); - gst_structure_set (structure, "channels", G_TYPE_INT, 2, NULL); - gst_structure_remove_field (structure, "channel-mask"); + for (i = 0; i < gst_caps_get_size (res); i++) { + structure = gst_caps_get_structure (res, i); + if (direction == GST_PAD_SRC) { + GST_INFO ("allow 1-2 channels"); + gst_structure_set (structure, "channels", GST_TYPE_INT_RANGE, 1, 2, NULL); + gst_structure_remove_field (structure, "channel-mask"); + } else { + GST_INFO ("allow 2 channels"); + gst_structure_set (structure, "channels", G_TYPE_INT, 2, NULL); + gst_structure_remove_field (structure, "channel-mask"); + } + } + + if (filter) { + GstCaps *intersection; + + GST_DEBUG_OBJECT (base, "Using filter caps %" GST_PTR_FORMAT, filter); + intersection = + gst_caps_intersect_full (filter, res, GST_CAPS_INTERSECT_FIRST); + gst_caps_unref (res); + res = intersection; + GST_DEBUG_OBJECT (base, "Intersection %" GST_PTR_FORMAT, res); } return res; -- 2.7.4