diff options
| author | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2012-01-04 15:05:41 +0100 |
|---|---|---|
| committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2012-01-05 10:36:49 +0100 |
| commit | 4b6a410be093faff9527504e03cf6d1a91df6cdf (patch) | |
| tree | eb0e71fb66713606dc868a0ab67787a9e5afa1ed | |
| parent | 42bdbbcb290fe28ea6481fcd3b8683ca3fe8e25d (diff) | |
speex: Update for the new raw audio caps
| -rw-r--r-- | ext/speex/gstspeexdec.c | 8 | ||||
| -rw-r--r-- | ext/speex/gstspeexenc.c | 9 |
2 files changed, 16 insertions, 1 deletions
diff --git a/ext/speex/gstspeexdec.c b/ext/speex/gstspeexdec.c index 19368202b..4ba4d285f 100644 --- a/ext/speex/gstspeexdec.c +++ b/ext/speex/gstspeexdec.c @@ -67,6 +67,7 @@ GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_ALWAYS, GST_STATIC_CAPS ("audio/x-raw, " "format = (string) " FORMAT_STR ", " + "layout = (string) interleaved, " "rate = (int) [ 6000, 48000 ], " "channels = (int) [ 1, 2 ]") ); @@ -231,9 +232,16 @@ gst_speex_dec_parse_header (GstSpeexDec * dec, GstBuffer * buf) /* set caps */ caps = gst_caps_new_simple ("audio/x-raw", "format", G_TYPE_STRING, FORMAT_STR, + "layout", G_TYPE_STRING, "interleaved", "rate", G_TYPE_INT, dec->header->rate, "channels", G_TYPE_INT, dec->header->nb_channels, NULL); + if (dec->header->nb_channels == 2) { + gst_caps_set_simple (caps, "channel-mask", GST_TYPE_BITMASK, + GST_AUDIO_CHANNEL_POSITION_MASK (FRONT_LEFT) | + GST_AUDIO_CHANNEL_POSITION_MASK (FRONT_RIGHT), NULL); + } + if (!gst_pad_set_caps (GST_AUDIO_DECODER_SRC_PAD (dec), caps)) goto nego_failed; diff --git a/ext/speex/gstspeexenc.c b/ext/speex/gstspeexenc.c index 01202ea85..3bf2bbc5e 100644 --- a/ext/speex/gstspeexenc.c +++ b/ext/speex/gstspeexenc.c @@ -59,7 +59,14 @@ static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_ALWAYS, GST_STATIC_CAPS ("audio/x-raw, " "format = (string) " FORMAT_STR ", " - "rate = (int) [ 6000, 48000 ], " "channels = (int) [ 1, 2 ]") + "layout = (string) interleaved, " + "rate = (int) [ 6000, 48000 ], " + "channels = (int) 1; " + "audio/x-raw, " + "format = (string) " FORMAT_STR ", " + "layout = (string) interleaved, " + "rate = (int) [ 6000, 48000 ], " + "channels = (int) 2, " "channel-mask = (bitmask) 0x3") ); static GstStaticPadTemplate src_factory = GST_STATIC_PAD_TEMPLATE ("src", |