From c87d271008585c17e6c0f4445bd30e24f5c0b19d Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Thu, 29 Sep 2011 13:46:36 +0200 Subject: [PATCH] tests: update for new audio caps --- tests/check/elements/gdpdepay.c | 21 ++++++++------------- tests/check/elements/gdppay.c | 20 ++++++++------------ 2 files changed, 16 insertions(+), 25 deletions(-) diff --git a/tests/check/elements/gdpdepay.c b/tests/check/elements/gdpdepay.c index 6a1a9f1bd5..927cfbd147 100644 --- a/tests/check/elements/gdpdepay.c +++ b/tests/check/elements/gdpdepay.c @@ -30,24 +30,19 @@ * get_peer, and then remove references in every test function */ static GstPad *mysrcpad, *mysinkpad, *myshsinkpad; +#define FORMATS "{ S8, "GST_AUDIO_NE(S16)" }" + #define AUDIO_CAPS_TEMPLATE_STRING \ - "audio/x-raw-int, " \ + "audio/x-raw, " \ + "format = (string) "FORMATS", " \ "rate = (int) [ 1, MAX ], " \ - "channels = (int) [ 1, 8 ], " \ - "endianness = (int) BYTE_ORDER, " \ - "width = (int) {8, 16}, " \ - "depth = (int) {8, 16}, " \ - "signed = (boolean) true" + "channels = (int) [ 1, 8 ]" #define AUDIO_CAPS_STRING \ - "audio/x-raw-int, " \ + "audio/x-raw, " \ + "format = (string) "GST_AUDIO_NE(S16)", " \ "rate = (int) 1000, " \ - "channels = (int) 2, " \ - "endianness = (int) BYTE_ORDER, " \ - "width = (int) 16, " \ - "depth = (int) 16, " \ - "signed = (boolean) true" - + "channels = (int) 2" static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, diff --git a/tests/check/elements/gdppay.c b/tests/check/elements/gdppay.c index 05391f1057..4c6ccf07fa 100644 --- a/tests/check/elements/gdppay.c +++ b/tests/check/elements/gdppay.c @@ -29,23 +29,19 @@ * get_peer, and then remove references in every test function */ static GstPad *mysrcpad, *myshsrcpad, *mysinkpad; +#define FORMATS "{ S8, "GST_AUDIO_NE(S16)" }" + #define AUDIO_CAPS_TEMPLATE_STRING \ - "audio/x-raw-int, " \ + "audio/x-raw, " \ + "format = (string) "FORMATS", " \ "rate = (int) [ 1, MAX ], " \ - "channels = (int) [ 1, 8 ], " \ - "endianness = (int) BYTE_ORDER, " \ - "width = (int) {8, 16}, " \ - "depth = (int) {8, 16}, " \ - "signed = (boolean) true" + "channels = (int) [ 1, 8 ]" #define AUDIO_CAPS_STRING \ - "audio/x-raw-int, " \ + "audio/x-raw, " \ + "format = (string) "GST_AUDIO_NE(S16)", " \ "rate = (int) 1000, " \ - "channels = (int) 2, " \ - "endianness = (int) BYTE_ORDER, " \ - "width = (int) 16, " \ - "depth = (int) 16, " \ - "signed = (boolean) true" + "channels = (int) 2" static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE ("sink", -- 2.34.1