From 8cd8965e1920522dfb535e9dec0afb03d9d9c8af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk>
Date: Sat, 31 Dec 2011 14:31:08 +0100
Subject: [PATCH] gst: Add new layout field to all raw audio caps

---
 gst/adder/gstadder.c         | 6 ++++--
 gst/audiorate/gstaudiorate.c | 6 ++++--
 gst/volume/gstvolume.c       | 6 ++++--
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/gst/adder/gstadder.c b/gst/adder/gstadder.c
index 3c4b0f024a..fa1f957e7c 100644
--- a/gst/adder/gstadder.c
+++ b/gst/adder/gstadder.c
@@ -76,10 +76,12 @@ GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT);
 
 #if G_BYTE_ORDER == G_LITTLE_ENDIAN
 #define CAPS \
-  GST_AUDIO_CAPS_MAKE ("{ S32LE, U32LE, S16LE, U16LE, S8, U8, F32LE, F64LE }")
+  GST_AUDIO_CAPS_MAKE ("{ S32LE, U32LE, S16LE, U16LE, S8, U8, F32LE, F64LE }") \
+  ", layout = (string) { interleaved, non-interleaved }"
 #else
 #define CAPS \
-  GST_AUDIO_CAPS_MAKE ("{ S32BE, U32BE, S16BE, U16BE, S8, U8, F32BE, F64BE }")
+  GST_AUDIO_CAPS_MAKE ("{ S32BE, U32BE, S16BE, U16BE, S8, U8, F32BE, F64BE }") \
+  ", layout = (string) { interleaved, non-interleaved }"
 #endif
 
 static GstStaticPadTemplate gst_adder_src_template =
diff --git a/gst/audiorate/gstaudiorate.c b/gst/audiorate/gstaudiorate.c
index 8a3d6a53c7..82074755f8 100644
--- a/gst/audiorate/gstaudiorate.c
+++ b/gst/audiorate/gstaudiorate.c
@@ -96,14 +96,16 @@ static GstStaticPadTemplate gst_audio_rate_src_template =
 GST_STATIC_PAD_TEMPLATE ("src",
     GST_PAD_SRC,
     GST_PAD_ALWAYS,
-    GST_STATIC_CAPS (GST_AUDIO_CAPS_MAKE (GST_AUDIO_FORMATS_ALL))
+    GST_STATIC_CAPS (GST_AUDIO_CAPS_MAKE (GST_AUDIO_FORMATS_ALL)
+        ", layout = (string) { interleaved, non-interleaved }")
     );
 
 static GstStaticPadTemplate gst_audio_rate_sink_template =
 GST_STATIC_PAD_TEMPLATE ("sink",
     GST_PAD_SINK,
     GST_PAD_ALWAYS,
-    GST_STATIC_CAPS (GST_AUDIO_CAPS_MAKE (GST_AUDIO_FORMATS_ALL))
+    GST_STATIC_CAPS (GST_AUDIO_CAPS_MAKE (GST_AUDIO_FORMATS_ALL)
+        ", layout = (string) { interleaved, non-interleaved }")
     );
 
 static gboolean gst_audio_rate_sink_event (GstPad * pad, GstObject * parent,
diff --git a/gst/volume/gstvolume.c b/gst/volume/gstvolume.c
index 3dd259bb8e..c19991e13e 100644
--- a/gst/volume/gstvolume.c
+++ b/gst/volume/gstvolume.c
@@ -104,10 +104,12 @@ enum
 
 #if G_BYTE_ORDER == G_LITTLE_ENDIAN
 #define ALLOWED_CAPS \
-    GST_AUDIO_CAPS_MAKE ("{ F32LE, F64LE, S8, S16LE, S24LE, S32LE }")
+    GST_AUDIO_CAPS_MAKE ("{ F32LE, F64LE, S8, S16LE, S24LE, S32LE }") \
+    ", layout = (string) interleaved"
 #else
 #define ALLOWED_CAPS \
-    GST_AUDIO_CAPS_MAKE ("{ F32BE, F64BE, S8, S16BE, S24BE, S32BE }")
+    GST_AUDIO_CAPS_MAKE ("{ F32BE, F64BE, S8, S16BE, S24BE, S32BE }") \
+    ", layout = (string) { interleaved, non-interleaved }"
 #endif
 
 static void gst_volume_mixer_init (GstMixerInterface * iface);