From daafce54ac19352516d7798d2bcbb01a811be77c Mon Sep 17 00:00:00 2001 From: "Jan Alexander Steffens (heftig)" Date: Wed, 19 Jun 2019 14:08:06 +0200 Subject: [PATCH] test: flvmux: Use gst_harness_sink_push_many And check its return value. --- tests/check/elements/flvmux.c | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/tests/check/elements/flvmux.c b/tests/check/elements/flvmux.c index 788ad15cb9..a4a8bf68c6 100644 --- a/tests/check/elements/flvmux.c +++ b/tests/check/elements/flvmux.c @@ -480,7 +480,6 @@ GST_START_TEST (test_video_caps_late) GstHarness *v_sink = gst_harness_new_with_element (demux->element, NULL, NULL); DemuxHarnesses harnesses = { a_sink, v_sink }; - guint i; GstTestClock *tclock; g_object_set (mux->element, "streamable", TRUE, @@ -532,8 +531,7 @@ GST_START_TEST (test_video_caps_late) /* push from flvmux to demux */ - for (i = 0; i < 6; i++) - gst_harness_push_to_sink (mux); + fail_unless_equals_int (GST_FLOW_OK, gst_harness_sink_push_many (mux, 6)); /* verify we got 2x audio and 1x video buffers out of flvdemux */ gst_buffer_unref (gst_harness_pull (a_sink)); @@ -572,7 +570,6 @@ GST_START_TEST (test_video_caps_change_streamable) GstHarness *v_sink = gst_harness_new_with_element (demux->element, NULL, NULL); DemuxHarnesses harnesses = { a_sink, v_sink }; - guint i; const GstClockTime base_time = 123456789; const GstClockTime duration_ms = 20; @@ -605,9 +602,7 @@ GST_START_TEST (test_video_caps_change_streamable) gst_harness_crank_single_clock_wait (mux); /* push from flvmux to demux */ - for (i = 0; i < 6; i++) { - gst_harness_push_to_sink (mux); - } + fail_unless_equals_int (GST_FLOW_OK, gst_harness_sink_push_many (mux, 6)); /* should accept without the constraint */ while ((event = gst_harness_try_pull_event (v_sink))) { @@ -633,9 +628,7 @@ GST_START_TEST (test_video_caps_change_streamable) gst_harness_crank_single_clock_wait (mux); /* push from flvmux to demux */ - for (i = 0; i < 2; i++) { - gst_harness_push_to_sink (mux); - } + fail_unless_equals_int (GST_FLOW_OK, gst_harness_sink_push_many (mux, 2)); /* should accept without the constraint */ while ((event = gst_harness_try_pull_event (v_sink))) { @@ -680,7 +673,6 @@ GST_START_TEST (test_audio_caps_change_streamable) GstHarness *v_sink = gst_harness_new_with_element (demux->element, NULL, NULL); DemuxHarnesses harnesses = { a_sink, v_sink }; - guint i; const GstClockTime base_time = 123456789; const GstClockTime duration_ms = 20; @@ -713,9 +705,7 @@ GST_START_TEST (test_audio_caps_change_streamable) gst_harness_crank_single_clock_wait (mux); /* push from flvmux to demux */ - for (i = 0; i < 6; i++) { - gst_harness_push_to_sink (mux); - } + fail_unless_equals_int (GST_FLOW_OK, gst_harness_sink_push_many (mux, 6)); /* should accept without the constraint */ while ((event = gst_harness_try_pull_event (a_sink))) { @@ -743,9 +733,7 @@ GST_START_TEST (test_audio_caps_change_streamable) gst_harness_crank_single_clock_wait (mux); /* push from flvmux to demux */ - for (i = 0; i < 2; i++) { - gst_harness_push_to_sink (mux); - } + fail_unless_equals_int (GST_FLOW_OK, gst_harness_sink_push_many (mux, 2)); /* should accept without the constraint */ while ((event = gst_harness_try_pull_event (a_sink))) {