From 686698bf729352c543cdb973e0f7f731d53040c3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sebastian=20Dr=C3=B6ge?= Date: Wed, 4 Jan 2012 11:02:43 +0100 Subject: [PATCH] audiofx: Port to the new multichannel caps and the new raw audio layout field --- gst/audiofx/audioamplify.c | 3 ++- gst/audiofx/audiodynamic.c | 3 ++- gst/audiofx/audioecho.c | 3 ++- gst/audiofx/audiofxbasefirfilter.c | 7 ++++--- gst/audiofx/audiofxbaseiirfilter.c | 3 ++- gst/audiofx/audioinvert.c | 5 +++-- gst/audiofx/audiokaraoke.c | 4 +++- gst/audiofx/audiopanorama.c | 10 ++++++++-- 8 files changed, 26 insertions(+), 12 deletions(-) diff --git a/gst/audiofx/audioamplify.c b/gst/audiofx/audioamplify.c index f8dbb21..1be23e5 100644 --- a/gst/audiofx/audioamplify.c +++ b/gst/audiofx/audioamplify.c @@ -99,7 +99,8 @@ gst_audio_amplify_clipping_method_get_type (void) " format=(string) {S8,"GST_AUDIO_NE(S16)","GST_AUDIO_NE(S32)"," \ GST_AUDIO_NE(F32)","GST_AUDIO_NE(F64)"}," \ " rate=(int)[1,MAX]," \ - " channels=(int)[1,MAX]" + " channels=(int)[1,MAX], " \ + " layout=(string) {interleaved, non-interleaved}" G_DEFINE_TYPE (GstAudioAmplify, gst_audio_amplify, GST_TYPE_AUDIO_FILTER); diff --git a/gst/audiofx/audiodynamic.c b/gst/audiofx/audiodynamic.c index 564dd7f..0fafc26 100644 --- a/gst/audiofx/audiodynamic.c +++ b/gst/audiofx/audiodynamic.c @@ -72,7 +72,8 @@ enum "audio/x-raw," \ " format=(string) {"GST_AUDIO_NE(S16)","GST_AUDIO_NE(F32)"}," \ " rate=(int)[1,MAX]," \ - " channels=(int)[1,MAX]" + " channels=(int)[1,MAX]," \ + " layout=(string) {interleaved, non-interleaved}" G_DEFINE_TYPE (GstAudioDynamic, gst_audio_dynamic, GST_TYPE_AUDIO_FILTER); diff --git a/gst/audiofx/audioecho.c b/gst/audiofx/audioecho.c index 38cafd2..86fceb6 100644 --- a/gst/audiofx/audioecho.c +++ b/gst/audiofx/audioecho.c @@ -69,7 +69,8 @@ enum "audio/x-raw," \ " format=(string) {"GST_AUDIO_NE(F32)","GST_AUDIO_NE(F64)"}, " \ " rate=(int)[1,MAX]," \ - " channels=(int)[1,MAX]" + " channels=(int)[1,MAX]," \ + " layout=(string) interleaved" #define gst_audio_echo_parent_class parent_class G_DEFINE_TYPE (GstAudioEcho, gst_audio_echo, GST_TYPE_AUDIO_FILTER); diff --git a/gst/audiofx/audiofxbasefirfilter.c b/gst/audiofx/audiofxbasefirfilter.c index 5022af5..da0b35f 100644 --- a/gst/audiofx/audiofxbasefirfilter.c +++ b/gst/audiofx/audiofxbasefirfilter.c @@ -37,10 +37,11 @@ GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT); #define ALLOWED_CAPS \ - "audio/x-raw, " \ + "audio/x-raw, " \ " format=(string){"GST_AUDIO_NE(F32)","GST_AUDIO_NE(F64)"}, " \ - " rate = (int) [ 1, MAX ], " \ - " channels = (int) [ 1, MAX ]" + " rate = (int) [ 1, MAX ], " \ + " channels = (int) [ 1, MAX ], " \ + " layout=(string) interleaved" /* Switch from time-domain to FFT convolution for kernels >= this */ #define FFT_THRESHOLD 32 diff --git a/gst/audiofx/audiofxbaseiirfilter.c b/gst/audiofx/audiofxbaseiirfilter.c index ee2f88d..2d31882 100644 --- a/gst/audiofx/audiofxbaseiirfilter.c +++ b/gst/audiofx/audiofxbaseiirfilter.c @@ -40,7 +40,8 @@ GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT); "audio/x-raw," \ " format=(string){"GST_AUDIO_NE(F32)","GST_AUDIO_NE(F64)"}," \ " rate = (int) [ 1, MAX ]," \ - " channels = (int) [ 1, MAX ]" + " channels = (int) [ 1, MAX ]," \ + " layout=(string) interleaved" #define gst_audio_fx_base_iir_filter_parent_class parent_class G_DEFINE_TYPE (GstAudioFXBaseIIRFilter, diff --git a/gst/audiofx/audioinvert.c b/gst/audiofx/audioinvert.c index dc61b26..928d2f8 100644 --- a/gst/audiofx/audioinvert.c +++ b/gst/audiofx/audioinvert.c @@ -65,9 +65,10 @@ enum #define ALLOWED_CAPS \ "audio/x-raw," \ - " format=(string) {"GST_AUDIO_NE(S16)","GST_AUDIO_NE(F32)"}," \ + " format=(string) {"GST_AUDIO_NE(S16)","GST_AUDIO_NE(F32)"}," \ " rate=(int)[1,MAX]," \ - " channels=(int)[1,MAX] " + " channels=(int)[1,MAX]," \ + " layout=(string) {interleaved, non-interleaved}" G_DEFINE_TYPE (GstAudioInvert, gst_audio_invert, GST_TYPE_AUDIO_FILTER); diff --git a/gst/audiofx/audiokaraoke.c b/gst/audiofx/audiokaraoke.c index 4d09eed..4714af5 100644 --- a/gst/audiofx/audiokaraoke.c +++ b/gst/audiofx/audiokaraoke.c @@ -74,7 +74,9 @@ enum "audio/x-raw," \ " format=(string){"GST_AUDIO_NE(S16)","GST_AUDIO_NE(F32)"}," \ " rate=(int)[1,MAX]," \ - " channels=(int)[1,MAX]" + " channels=(int)2," \ + " channel-mask=(bitmask)0x3," \ + " layout=(string) interleaved" G_DEFINE_TYPE (GstAudioKaraoke, gst_audio_karaoke, GST_TYPE_AUDIO_FILTER); diff --git a/gst/audiofx/audiopanorama.c b/gst/audiofx/audiopanorama.c index 0802c4c..6878300 100644 --- a/gst/audiofx/audiopanorama.c +++ b/gst/audiofx/audiopanorama.c @@ -95,7 +95,12 @@ static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_ALWAYS, GST_STATIC_CAPS ("audio/x-raw, " "format = (string) { " GST_AUDIO_NE (S32) ", " GST_AUDIO_NE (S16) "}, " - "rate = (int) [ 1, MAX ], " "channels = (int) [ 1, 2 ]") + "rate = (int) [ 1, MAX ], " "channels = (int) 1, " + "layout = (string) interleaved;" + "audio/x-raw, " + "format = (string) { " GST_AUDIO_NE (S32) ", " GST_AUDIO_NE (S16) "}, " + "rate = (int) [ 1, MAX ], " "channels = (int) 2, " + "layout = (string) interleaved, " "channel-mask = (bitmask) 0x3") ); static GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE ("src", @@ -103,7 +108,8 @@ static GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_ALWAYS, GST_STATIC_CAPS ("audio/x-raw, " "format = (string) { " GST_AUDIO_NE (S32) ", " GST_AUDIO_NE (S16) "}, " - "rate = (int) [ 1, MAX ], " "channels = (int) 2") + "rate = (int) [ 1, MAX ], " "channels = (int) 2, " + "layout = (string) interleaved, " "channel-mask = (bitmask)0x3") ); G_DEFINE_TYPE (GstAudioPanorama, gst_audio_panorama, GST_TYPE_BASE_TRANSFORM); -- 2.7.4