[0.11] gst-plugins-good: oss: Port to the new multichannel caps and the raw audio caps interleaved field

[Sebastian Dröge]

Module: gst-plugins-good
Branch: 0.11
Commit: 177dd68d0669ef9f5a5ae40ea6f9a8fd8f2d61c3
URL:    http://cgit.freedesktop.org/gstreamer/gst-plugins-good/commit/?id=177dd68d0669ef9f5a5ae40ea6f9a8fd8f2d61c3

Author: Sebastian Dröge <sebastian.droege at collabora.co.uk>
Date:   Wed Jan  4 10:54:46 2012 +0100

oss: Port to the new multichannel caps and the raw audio caps interleaved field

---

 sys/oss/gstosssink.c |   11 +++++++++--
 sys/oss/gstosssrc.c  |    9 ++++++++-
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/sys/oss/gstosssink.c b/sys/oss/gstosssink.c
index 6a8046d..6781347 100644
--- a/sys/oss/gstosssink.c
+++ b/sys/oss/gstosssink.c
@@ -113,12 +113,19 @@ enum
 #define FORMATS "{" GST_AUDIO_NE(S16)","GST_AUDIO_NE(U16)", S8, U8 }"
 
 static GstStaticPadTemplate osssink_sink_factory =
-GST_STATIC_PAD_TEMPLATE ("sink",
+    GST_STATIC_PAD_TEMPLATE ("sink",
     GST_PAD_SINK,
     GST_PAD_ALWAYS,
     GST_STATIC_CAPS ("audio/x-raw, "
         "format = (string) " FORMATS ", "
-        "rate = (int) [ 1, MAX ], " "channels = (int) [ 1, 2 ]")
+        "layout = (string) interleaved, "
+        "rate = (int) [ 1, MAX ], "
+        "channels = (int) 1; "
+        "audio/x-raw, "
+        "format = (string) " FORMATS ", "
+        "layout = (string) interleaved, "
+        "rate = (int) [ 1, MAX ], "
+        "channels = (int) 2, " "channel-mask = (bitmask) 0x3")
     );
 
 static GstElementClass *parent_class = NULL;
diff --git a/sys/oss/gstosssrc.c b/sys/oss/gstosssrc.c
index bdadbbc..f8ac8a9 100644
--- a/sys/oss/gstosssrc.c
+++ b/sys/oss/gstosssrc.c
@@ -108,7 +108,14 @@ static GstStaticPadTemplate osssrc_src_factory = GST_STATIC_PAD_TEMPLATE ("src",
     GST_PAD_ALWAYS,
     GST_STATIC_CAPS ("audio/x-raw, "
         "format = (string) " FORMATS ", "
-        "rate = (int) [ 1, MAX ], " "channels = (int) [ 1, 2 ]")
+        "layout = (string) interleaved, "
+        "rate = (int) [ 1, MAX ], "
+        "channels = (int) 1; "
+        "audio/x-raw, "
+        "format = (string) " FORMATS ", "
+        "layout = (string) interleaved, "
+        "rate = (int) [ 1, MAX ], "
+        "channels = (int) 2, " "channel-mask = (bitmask) 0x3")
     );
 
 static void