Commit 686698bf authored by Sebastian Dröge's avatar Sebastian Dröge
Browse files

audiofx: Port to the new multichannel caps and the new raw audio layout field

parent 177dd68d
......@@ -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);
......
......@@ -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);
......
......@@ -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);
......
......@@ -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
......
......@@ -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,
......
......@@ -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);
......
......@@ -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);
......
......@@ -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);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment