From 38a7abe545240accd06cb11cb82e8134f37c1c62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Sun, 6 Jan 2008 14:39:19 +0000 Subject: [PATCH] tests/check/pipelines/theoraenc.c: Turn these functions into macros so we can see right away where the failure occured. Original commit message from CVS: * tests/check/pipelines/theoraenc.c: (check_buffer_is_header), (check_buffer_timestamp), (check_buffer_duration): Turn these functions into macros so we can see right away where the failure occured. --- ChangeLog | 7 ++++++ tests/check/pipelines/theoraenc.c | 40 +++++++++++++------------------ 2 files changed, 23 insertions(+), 24 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7fad14a356..449a09be2f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-01-06 Tim-Philipp Müller + + * tests/check/pipelines/theoraenc.c: (check_buffer_is_header), + (check_buffer_timestamp), (check_buffer_duration): + Turn these functions into macros so we can see right away + where the failure occured. + 2008-01-05 Julien Moutte * sys/xvimage/xvimagesink.c: (gst_xvimagesink_xvimage_new): Add diff --git a/tests/check/pipelines/theoraenc.c b/tests/check/pipelines/theoraenc.c index f585bdbdd9..dfb7ea11ac 100644 --- a/tests/check/pipelines/theoraenc.c +++ b/tests/check/pipelines/theoraenc.c @@ -31,32 +31,24 @@ /* I know all of these have a shift of 6 bits */ #define GRANULEPOS_SHIFT 6 -static void -check_buffer_is_header (GstBuffer * buffer, gboolean is_header) -{ - fail_unless (GST_BUFFER_FLAG_IS_SET (buffer, - GST_BUFFER_FLAG_IN_CAPS) == is_header, - "GST_BUFFER_IN_CAPS is set to %d but expected %d", - GST_BUFFER_FLAG_IS_SET (buffer, GST_BUFFER_FLAG_IN_CAPS), is_header); -} -static void -check_buffer_timestamp (GstBuffer * buffer, GstClockTime timestamp) -{ - fail_unless (GST_BUFFER_TIMESTAMP (buffer) == timestamp, - "expected timestamp %" GST_TIME_FORMAT - ", but got timestamp %" GST_TIME_FORMAT, - GST_TIME_ARGS (timestamp), GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (buffer))); -} +#define check_buffer_is_header(buffer,is_header) \ + fail_unless (GST_BUFFER_FLAG_IS_SET (buffer, \ + GST_BUFFER_FLAG_IN_CAPS) == is_header, \ + "GST_BUFFER_IN_CAPS is set to %d but expected %d", \ + GST_BUFFER_FLAG_IS_SET (buffer, GST_BUFFER_FLAG_IN_CAPS), is_header) -static void -check_buffer_duration (GstBuffer * buffer, GstClockTime duration) -{ - fail_unless (GST_BUFFER_DURATION (buffer) == duration, - "expected duration %" GST_TIME_FORMAT - ", but got duration %" GST_TIME_FORMAT, - GST_TIME_ARGS (duration), GST_TIME_ARGS (GST_BUFFER_DURATION (buffer))); -} +#define check_buffer_timestamp(buffer,timestamp) \ + fail_unless (GST_BUFFER_TIMESTAMP (buffer) == timestamp, \ + "expected timestamp %" GST_TIME_FORMAT \ + ", but got timestamp %" GST_TIME_FORMAT, \ + GST_TIME_ARGS (timestamp), GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (buffer))) + +#define check_buffer_duration(buffer,duration) \ + fail_unless (GST_BUFFER_DURATION (buffer) == duration, \ + "expected duration %" GST_TIME_FORMAT \ + ", but got duration %" GST_TIME_FORMAT, \ + GST_TIME_ARGS (duration), GST_TIME_ARGS (GST_BUFFER_DURATION (buffer))) static void check_buffer_granulepos (GstBuffer * buffer, gint64 granulepos)