From e309e88bd6b27c0b8098db9ca6b946ec67a27135 Mon Sep 17 00:00:00 2001 From: Stefan Sauer Date: Sat, 15 Jul 2017 19:43:52 +0200 Subject: [PATCH] tests: adder: add helper to create buffers Keeps repeated code out of the test and syncs it with the audiomixer test. --- tests/check/elements/adder.c | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/tests/check/elements/adder.c b/tests/check/elements/adder.c index ca75599993..58af07e734 100644 --- a/tests/check/elements/adder.c +++ b/tests/check/elements/adder.c @@ -160,6 +160,16 @@ message_received (GstBus * bus, GstMessage * message, GstPipeline * bin) } } +static GstBuffer * +new_buffer (gsize num_bytes, GstClockTime ts, GstClockTime dur) +{ + GstBuffer *buffer = gst_buffer_new_and_alloc (num_bytes); + + GST_BUFFER_TIMESTAMP (buffer) = ts; + GST_BUFFER_DURATION (buffer) = dur; + GST_DEBUG ("created buffer %p", buffer); + return buffer; +} /* make sure downstream gets a CAPS event before buffers are sent */ GST_START_TEST (test_caps) @@ -845,39 +855,27 @@ GST_START_TEST (test_clip) gst_pad_send_event (sinkpad, event); /* should be clipped and ok */ - buffer = gst_buffer_new_and_alloc (44100); - GST_BUFFER_TIMESTAMP (buffer) = 0; - GST_BUFFER_DURATION (buffer) = 250 * GST_MSECOND; - GST_DEBUG ("pushing buffer %p", buffer); + buffer = new_buffer (44100, 0, 250 * GST_MSECOND); ret = gst_pad_chain (sinkpad, buffer); ck_assert_int_eq (ret, GST_FLOW_OK); fail_unless (handoff_buffer == NULL); /* should be partially clipped */ - buffer = gst_buffer_new_and_alloc (44100); - GST_BUFFER_TIMESTAMP (buffer) = 900 * GST_MSECOND; - GST_BUFFER_DURATION (buffer) = 250 * GST_MSECOND; - GST_DEBUG ("pushing buffer %p", buffer); + buffer = new_buffer (44100, 900 * GST_MSECOND, 250 * GST_MSECOND); ret = gst_pad_chain (sinkpad, buffer); ck_assert_int_eq (ret, GST_FLOW_OK); fail_unless (handoff_buffer != NULL); gst_buffer_replace (&handoff_buffer, NULL); /* should not be clipped */ - buffer = gst_buffer_new_and_alloc (44100); - GST_BUFFER_TIMESTAMP (buffer) = 1 * GST_SECOND; - GST_BUFFER_DURATION (buffer) = 250 * GST_MSECOND; - GST_DEBUG ("pushing buffer %p", buffer); + buffer = new_buffer (44100, 1 * GST_SECOND, 250 * GST_MSECOND); ret = gst_pad_chain (sinkpad, buffer); ck_assert_int_eq (ret, GST_FLOW_OK); fail_unless (handoff_buffer != NULL); gst_buffer_replace (&handoff_buffer, NULL); /* should be clipped and ok */ - buffer = gst_buffer_new_and_alloc (44100); - GST_BUFFER_TIMESTAMP (buffer) = 2 * GST_SECOND; - GST_BUFFER_DURATION (buffer) = 250 * GST_MSECOND; - GST_DEBUG ("pushing buffer %p", buffer); + buffer = new_buffer (44100, 2 * GST_SECOND, 250 * GST_MSECOND); ret = gst_pad_chain (sinkpad, buffer); ck_assert_int_eq (ret, GST_FLOW_OK); fail_unless (handoff_buffer == NULL);