[0.11] gst-plugins-good: tests: fix more tests
Wim Taymans
wtay at kemper.freedesktop.org
Mon Feb 6 04:31:36 PST 2012
Module: gst-plugins-good
Branch: 0.11
Commit: ef0686c52ccaf7e046b280fc623112d68495ec57
URL: http://cgit.freedesktop.org/gstreamer/gst-plugins-good/commit/?id=ef0686c52ccaf7e046b280fc623112d68495ec57
Author: Wim Taymans <wim.taymans at collabora.co.uk>
Date: Mon Feb 6 10:07:06 2012 +0100
tests: fix more tests
---
tests/check/elements/audioamplify.c | 7 +++++--
tests/check/elements/audiochebband.c | 4 ++++
tests/check/elements/audiocheblimit.c | 4 ++++
tests/check/elements/audiodynamic.c | 7 +++++--
tests/check/elements/audioecho.c | 21 ++++++++++++---------
5 files changed, 30 insertions(+), 13 deletions(-)
diff --git a/tests/check/elements/audioamplify.c b/tests/check/elements/audioamplify.c
index de43948..3b073c7 100644
--- a/tests/check/elements/audioamplify.c
+++ b/tests/check/elements/audioamplify.c
@@ -41,6 +41,7 @@ GstPad *mysrcpad, *mysinkpad;
"audio/x-raw, " \
"channels = (int) 1, " \
"rate = (int) 44100, " \
+ "layout = (string) interleaved, " \
"format = (string) " GST_AUDIO_NE(S16)
static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE ("sink",
@@ -49,14 +50,16 @@ static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE ("sink",
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 srctemplate = GST_STATIC_PAD_TEMPLATE ("src",
GST_PAD_SRC,
GST_PAD_ALWAYS,
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 GstElement *
setup_amplify (void)
diff --git a/tests/check/elements/audiochebband.c b/tests/check/elements/audiochebband.c
index f7afe7f..71e7c07 100644
--- a/tests/check/elements/audiochebband.c
+++ b/tests/check/elements/audiochebband.c
@@ -36,12 +36,14 @@ GstPad *mysrcpad, *mysinkpad;
"audio/x-raw, " \
"channels = (int) 1, " \
"rate = (int) 44100, " \
+ "layout = (string) interleaved, " \
"format = (string) " GST_AUDIO_NE(F32)
#define BUFFER_CAPS_STRING_64 \
"audio/x-raw, " \
"channels = (int) 1, " \
"rate = (int) 44100, " \
+ "layout = (string) interleaved, " \
"format = (string) " GST_AUDIO_NE(F64)
static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE ("sink",
@@ -50,6 +52,7 @@ static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE ("sink",
GST_STATIC_CAPS ("audio/x-raw, "
"channels = (int) 1, "
"rate = (int) 44100, "
+ "layout = (string) interleaved, "
"format = (string) { "
GST_AUDIO_NE (F32) ", " GST_AUDIO_NE (F64) " }"));
static GstStaticPadTemplate srctemplate = GST_STATIC_PAD_TEMPLATE ("src",
@@ -58,6 +61,7 @@ static GstStaticPadTemplate srctemplate = GST_STATIC_PAD_TEMPLATE ("src",
GST_STATIC_CAPS ("audio/x-raw, "
"channels = (int) 1, "
"rate = (int) 44100, "
+ "layout = (string) interleaved, "
"format = (string) { "
GST_AUDIO_NE (F32) ", " GST_AUDIO_NE (F64) " }"));
diff --git a/tests/check/elements/audiocheblimit.c b/tests/check/elements/audiocheblimit.c
index c8efc1f..6560e16 100644
--- a/tests/check/elements/audiocheblimit.c
+++ b/tests/check/elements/audiocheblimit.c
@@ -36,12 +36,14 @@ GstPad *mysrcpad, *mysinkpad;
"audio/x-raw, " \
"channels = (int) 1, " \
"rate = (int) 44100, " \
+ "layout = (string) interleaved, " \
"format = (string) " GST_AUDIO_NE(F32)
#define BUFFER_CAPS_STRING_64 \
"audio/x-raw, " \
"channels = (int) 1, " \
"rate = (int) 44100, " \
+ "layout = (string) interleaved, " \
"format = (string) " GST_AUDIO_NE(F64)
static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE ("sink",
@@ -50,6 +52,7 @@ static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE ("sink",
GST_STATIC_CAPS ("audio/x-raw, "
"channels = (int) 1, "
"rate = (int) 44100, "
+ "layout = (string) interleaved, "
"format = (string) { "
GST_AUDIO_NE (F32) ", " GST_AUDIO_NE (F64) " }"));
static GstStaticPadTemplate srctemplate = GST_STATIC_PAD_TEMPLATE ("src",
@@ -58,6 +61,7 @@ static GstStaticPadTemplate srctemplate = GST_STATIC_PAD_TEMPLATE ("src",
GST_STATIC_CAPS ("audio/x-raw, "
"channels = (int) 1, "
"rate = (int) 44100, "
+ "layout = (string) interleaved, "
"format = (string) { "
GST_AUDIO_NE (F32) ", " GST_AUDIO_NE (F64) " }"));
diff --git a/tests/check/elements/audiodynamic.c b/tests/check/elements/audiodynamic.c
index d31a464..c3fd7c4 100644
--- a/tests/check/elements/audiodynamic.c
+++ b/tests/check/elements/audiodynamic.c
@@ -41,6 +41,7 @@ GstPad *mysrcpad, *mysinkpad;
"audio/x-raw, " \
"channels = (int) 1, " \
"rate = (int) 44100, " \
+ "layout = (string) interleaved, " \
"format = (string) " GST_AUDIO_NE(S16)
static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE ("sink",
@@ -49,14 +50,16 @@ static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE ("sink",
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 srctemplate = GST_STATIC_PAD_TEMPLATE ("src",
GST_PAD_SRC,
GST_PAD_ALWAYS,
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 GstElement *
setup_dynamic (void)
diff --git a/tests/check/elements/audioecho.c b/tests/check/elements/audioecho.c
index 5c17234..dc8903c 100644
--- a/tests/check/elements/audioecho.c
+++ b/tests/check/elements/audioecho.c
@@ -31,7 +31,9 @@ GstPad *mysrcpad, *mysinkpad;
#define ECHO_CAPS_STRING \
"audio/x-raw, " \
"channels = (int) 2, " \
+ "channel-mask = (bitmask) 3, " \
"rate = (int) 100000, " \
+ "layout = (string) interleaved, " \
"format = (string) " GST_AUDIO_NE(F64)
static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE ("sink",
@@ -40,18 +42,16 @@ static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE ("sink",
GST_STATIC_CAPS ("audio/x-raw, "
"channels = (int) [ 1, 2 ], "
"rate = (int) [ 1, MAX ], "
- "format = (string) { "
- GST_AUDIO_NE(F32) ", "
- GST_AUDIO_NE(F64) " }"));
+ "format = (string) { "
+ GST_AUDIO_NE (F32) ", " GST_AUDIO_NE (F64) " }"));
static GstStaticPadTemplate srctemplate = GST_STATIC_PAD_TEMPLATE ("src",
GST_PAD_SRC,
GST_PAD_ALWAYS,
GST_STATIC_CAPS ("audio/x-raw, "
"channels = (int) [ 1, 2 ], "
"rate = (int) [ 1, MAX ], "
- "format = (string) { "
- GST_AUDIO_NE(F32) ", "
- GST_AUDIO_NE(F64) " }"));
+ "format = (string) { "
+ GST_AUDIO_NE (F32) ", " GST_AUDIO_NE (F64) " }"));
static GstElement *
setup_echo (void)
@@ -113,7 +113,8 @@ GST_START_TEST (test_passthrough)
fail_unless_equals_int (g_list_length (buffers), 1);
fail_if ((outbuffer = (GstBuffer *) buffers->data) == NULL);
- fail_unless (gst_buffer_extract (outbuffer, 0, res, sizeof (res)) == sizeof (res));
+ fail_unless (gst_buffer_extract (outbuffer, 0, res,
+ sizeof (res)) == sizeof (res));
GST_INFO
("expected %+lf %+lf %+lf %+lf %+lf %+lf real %+lf %+lf %+lf %+lf %+lf %+lf",
in[0], in[1], in[2], in[3], in[4], in[5], res[0], res[1], res[2], res[3],
@@ -156,7 +157,8 @@ GST_START_TEST (test_echo)
fail_unless_equals_int (g_list_length (buffers), 1);
fail_if ((outbuffer = (GstBuffer *) buffers->data) == NULL);
- fail_unless (gst_buffer_extract (outbuffer, 0, res, sizeof (res)) == sizeof (res));
+ fail_unless (gst_buffer_extract (outbuffer, 0, res,
+ sizeof (res)) == sizeof (res));
GST_INFO
("expected %+lf %+lf %+lf %+lf %+lf %+lf %+lf %+lf %+lf %+lf real %+lf %+lf %+lf %+lf %+lf %+lf %+lf %+lf %+lf %+lf",
out[0], out[1], out[2], out[3], out[4], out[5], out[6], out[7], out[8],
@@ -200,7 +202,8 @@ GST_START_TEST (test_feedback)
fail_unless_equals_int (g_list_length (buffers), 1);
fail_if ((outbuffer = (GstBuffer *) buffers->data) == NULL);
- fail_unless (gst_buffer_extract (outbuffer, 0, res, sizeof (res)) == sizeof (res));
+ fail_unless (gst_buffer_extract (outbuffer, 0, res,
+ sizeof (res)) == sizeof (res));
GST_INFO
("expected %+lf %+lf %+lf %+lf %+lf %+lf %+lf %+lf %+lf %+lf real %+lf %+lf %+lf %+lf %+lf %+lf %+lf %+lf %+lf %+lf",
out[0], out[1], out[2], out[3], out[4], out[5], out[6], out[7], out[8],
More information about the gstreamer-commits
mailing list