diff options
| author | Stefan Sauer <ensonic@users.sf.net> | 2013-02-15 08:20:59 +0100 |
|---|---|---|
| committer | Stefan Sauer <ensonic@users.sf.net> | 2013-02-15 21:30:33 +0100 |
| commit | 57ff02f485114a78dca99b9b835c9c4ad4179ed7 (patch) | |
| tree | c448278a1b5dae0e7952f44cc52742583343afd1 /gst/freeverb | |
| parent | e6e1479b75f2bd45e61852a32b4647fb880c405c (diff) | |
| download | gstreamer-plugins-bad-57ff02f485114a78dca99b9b835c9c4ad4179ed7.tar.gz | |
freeverb: remove channel-mask from caps
The channel-mask is only needed for channels>2 which we don't do.
Diffstat (limited to 'gst/freeverb')
| -rw-r--r-- | gst/freeverb/gstfreeverb.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/gst/freeverb/gstfreeverb.c b/gst/freeverb/gstfreeverb.c index f3fe1a626..c86b56800 100644 --- a/gst/freeverb/gstfreeverb.c +++ b/gst/freeverb/gstfreeverb.c @@ -76,12 +76,8 @@ static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_ALWAYS, GST_STATIC_CAPS ("audio/x-raw, " "format = (string) { " GST_AUDIO_NE (F32) ", " GST_AUDIO_NE (S16) "}, " - "rate = (int) [ 1, MAX ], " "channels = (int) 1, " - "layout = (string) interleaved;" - "audio/x-raw, " - "format = (string) { " GST_AUDIO_NE (F32) ", " GST_AUDIO_NE (S16) "}, " - "rate = (int) [ 1, MAX ], " "channels = (int) 2, " - "layout = (string) interleaved, " "channel-mask = (bitmask) 0x3") + "rate = (int) [ 1, MAX ], " "channels = (int) [ 1, 2 ], " + "layout = (string) interleaved") ); static GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE ("src", @@ -90,7 +86,7 @@ static GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE ("src", GST_STATIC_CAPS ("audio/x-raw, " "format = (string) { " GST_AUDIO_NE (F32) ", " GST_AUDIO_NE (S16) "}, " "rate = (int) [ 1, MAX ], " "channels = (int) 2, " - "layout = (string) interleaved, " "channel-mask = (bitmask) 0x3") + "layout = (string) interleaved") ); G_DEFINE_TYPE_WITH_CODE (GstFreeverb, gst_freeverb, GST_TYPE_BASE_TRANSFORM, @@ -640,11 +636,11 @@ gst_freeverb_transform_caps (GstBaseTransform * base, if (direction == GST_PAD_SRC) { GST_INFO_OBJECT (base, "[%d] allow 1-2 channels", i); gst_structure_set (structure, "channels", GST_TYPE_INT_RANGE, 1, 2, NULL); - gst_structure_remove_field (structure, "channel-mask"); } else { GST_INFO_OBJECT (base, "[%d] allow 2 channels", i); gst_structure_set (structure, "channels", G_TYPE_INT, 2, NULL); } + gst_structure_remove_field (structure, "channel-mask"); } GST_DEBUG_OBJECT (base, "transformed %" GST_PTR_FORMAT, res); @@ -673,6 +669,9 @@ gst_freeverb_set_caps (GstBaseTransform * base, GstCaps * incaps, if (!gst_audio_info_from_caps (&info, incaps)) goto no_format; + GST_DEBUG ("try to process %d input with %d channels", + GST_AUDIO_INFO_FORMAT (&info), GST_AUDIO_INFO_CHANNELS (&info)); + if (!gst_freeverb_set_process_function (filter, &info)) goto no_format; |