From 41648135b29289131994c331ad15eaf75b63808a Mon Sep 17 00:00:00 2001
From: Wim Taymans <wim.taymans@collabora.co.uk>
Date: Mon, 6 Feb 2012 13:44:20 +0100
Subject: [PATCH] tests: fix some more tests

---
 tests/check/elements/audiopanorama.c   | 13 ++++++++++---
 tests/check/elements/audiowsincband.c  |  4 ++++
 tests/check/elements/audiowsinclimit.c |  8 ++++++--
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/tests/check/elements/audiopanorama.c b/tests/check/elements/audiopanorama.c
index 42fce976d2..c21fe66867 100644
--- a/tests/check/elements/audiopanorama.c
+++ b/tests/check/elements/audiopanorama.c
@@ -38,18 +38,22 @@ GstPad *mysrcpad, *mysinkpad;
     "audio/x-raw, "                     \
     "channels = (int) 1, "              \
     "rate = (int) 44100, "              \
+    "layout = (string) interleaved, "   \
     "format = (string) " GST_AUDIO_NE(S16)
 
 #define PANORAMA_STEREO_CAPS_STRING  \
     "audio/x-raw, "                     \
     "channels = (int) 2, "              \
+    "channel-mask = (bitmask) 3, "      \
     "rate = (int) 44100, "              \
+    "layout = (string) interleaved, "   \
     "format = (string) " GST_AUDIO_NE(S16)
 
 #define PANORAMA_WRONG_CAPS_STRING  \
     "audio/x-raw, "                     \
     "channels = (int) 5, "              \
     "rate = (int) 44100, "              \
+    "layout = (string) interleaved, "   \
     "format = (string) " GST_AUDIO_NE(U16)
 
 
@@ -59,7 +63,8 @@ static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE ("sink",
     GST_STATIC_CAPS ("audio/x-raw, "
         "channels = (int) 2, "
         "rate = (int) [ 1,  MAX ], "
-	"format = (string) " GST_AUDIO_NE(S16))
+        "layout = (string) interleaved, "
+        "format = (string) " GST_AUDIO_NE (S16))
     );
 static GstStaticPadTemplate msrctemplate = GST_STATIC_PAD_TEMPLATE ("src",
     GST_PAD_SRC,
@@ -67,7 +72,8 @@ static GstStaticPadTemplate msrctemplate = GST_STATIC_PAD_TEMPLATE ("src",
     GST_STATIC_CAPS ("audio/x-raw, "
         "channels = (int) 1, "
         "rate = (int) [ 1,  MAX ], "
-	"format = (string) " GST_AUDIO_NE(S16))
+        "layout = (string) interleaved, "
+        "format = (string) " GST_AUDIO_NE (S16))
     );
 static GstStaticPadTemplate ssrctemplate = GST_STATIC_PAD_TEMPLATE ("src",
     GST_PAD_SRC,
@@ -75,7 +81,8 @@ static GstStaticPadTemplate ssrctemplate = GST_STATIC_PAD_TEMPLATE ("src",
     GST_STATIC_CAPS ("audio/x-raw, "
         "channels = (int) 2, "
         "rate = (int) [ 1,  MAX ], "
-	"format = (string) " GST_AUDIO_NE(S16))
+        "layout = (string) interleaved, "
+        "format = (string) " GST_AUDIO_NE (S16))
     );
 
 static GstElement *
diff --git a/tests/check/elements/audiowsincband.c b/tests/check/elements/audiowsincband.c
index 6d1e6a1a09..7b506be0e8 100644
--- a/tests/check/elements/audiowsincband.c
+++ b/tests/check/elements/audiowsincband.c
@@ -35,12 +35,14 @@ GstPad *mysrcpad, *mysinkpad;
 #define AUDIO_WSINC_BAND_CAPS_STRING_32          \
     "audio/x-raw, "                              \
     "format = (string) " GST_AUDIO_NE (F32) ", " \
+    "layout = (string) interleaved, "            \
     "channels = (int) 1, "                       \
     "rate = (int) 44100"
 
 #define AUDIO_WSINC_BAND_CAPS_STRING_64          \
     "audio/x-raw, "                              \
     "format = (string) " GST_AUDIO_NE (F64) ", " \
+    "layout = (string) interleaved, "            \
     "channels = (int) 1, "                       \
     "rate = (int) 44100"
 
@@ -51,6 +53,7 @@ static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE ("sink",
     GST_PAD_ALWAYS,
     GST_STATIC_CAPS ("audio/x-raw, "
         "format = (string) " FORMATS ", "
+        "layout = (string) interleaved, "
         "channels = (int) 1, " "rate = (int) 44100")
     );
 static GstStaticPadTemplate srctemplate = GST_STATIC_PAD_TEMPLATE ("src",
@@ -58,6 +61,7 @@ static GstStaticPadTemplate srctemplate = GST_STATIC_PAD_TEMPLATE ("src",
     GST_PAD_ALWAYS,
     GST_STATIC_CAPS ("audio/x-raw, "
         "format = (string) " FORMATS ", "
+        "layout = (string) interleaved, "
         "channels = (int) 1, " "rate = (int) 44100")
     );
 
diff --git a/tests/check/elements/audiowsinclimit.c b/tests/check/elements/audiowsinclimit.c
index bb0ea130ac..d3be5851c5 100644
--- a/tests/check/elements/audiowsinclimit.c
+++ b/tests/check/elements/audiowsinclimit.c
@@ -35,12 +35,14 @@ GstPad *mysrcpad, *mysinkpad;
 #define AUDIO_WSINC_LIMIT_CAPS_STRING_32           \
     "audio/x-raw, "                                \
     "format = (string) " GST_AUDIO_NE (F32) ", "   \
+    "layout = (string) interleaved, "              \
     "channels = (int) 1, "                         \
     "rate = (int) 44100"
 
 #define AUDIO_WSINC_LIMIT_CAPS_STRING_64           \
     "audio/x-raw, "                                \
     "format = (string) " GST_AUDIO_NE (F64) ", "   \
+    "layout = (string) interleaved, "              \
     "channels = (int) 1, "                         \
     "rate = (int) 44100"
 
@@ -50,14 +52,16 @@ static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE ("sink",
     GST_PAD_SINK,
     GST_PAD_ALWAYS,
     GST_STATIC_CAPS ("audio/x-raw, "
-        "channels = (string) " FORMATS ", "
+        "format = (string) " FORMATS ", "
+        "layout = (string) interleaved, "
         "channels = (int) 1, " "rate = (int) 44100")
     );
 static GstStaticPadTemplate srctemplate = GST_STATIC_PAD_TEMPLATE ("src",
     GST_PAD_SRC,
     GST_PAD_ALWAYS,
     GST_STATIC_CAPS ("audio/x-raw, "
-        "channels = (string) " FORMATS ", "
+        "format = (string) " FORMATS ", "
+        "layout = (string) interleaved, "
         "channels = (int) 1, " "rate = (int) 44100")
     );