mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-03 17:22:29 +00:00
Code Issues 1 Projects Releases Wiki Activity

tests: mpegtsmux: adjust again to modified buffer collect behaviour

Browse source 
... by effectively reverting previous adjustment.
This commit is contained in:
Mark Nauwelaerts 2012-06-16 16:44:32 +02:00
parent e8ab5af7b0
commit 179c50591c
1 changed files with 12 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
tests/check/elements/mpegtsmux.c
View file

@ -169,7 +169,7 @@ GST_START_TEST (test_force_key_unit_event_downstream)
GstClockTime timestamp, stream_time, running_time; GstClockTime timestamp, stream_time, running_time;
gboolean all_headers = TRUE; gboolean all_headers = TRUE;
gint count = 0; gint count = 0;
ThreadData *thread_data_1, *thread_data_2, *thread_data_3; ThreadData *thread_data_1, *thread_data_2, *thread_data_3, *thread_data_4;
TestData test_data = { 0, }; TestData test_data = { 0, };
mpegtsmux = gst_check_setup_element ("mpegtsmux"); mpegtsmux = gst_check_setup_element ("mpegtsmux");
@ -197,30 +197,23 @@ GST_START_TEST (test_force_key_unit_event_downstream)
thread_data_3 = pad_push (src3, gst_buffer_new (), 3 * GST_SECOND); thread_data_3 = pad_push (src3, gst_buffer_new (), 3 * GST_SECOND);
g_thread_join (thread_data_1->thread); g_thread_join (thread_data_1->thread);
g_thread_join (thread_data_2->thread);
g_thread_join (thread_data_3->thread);
fail_unless (test_data.sink_event == NULL); fail_unless (test_data.sink_event == NULL);
g_free (thread_data_1); /* push again on src1 so that the buffer on src2 is collected */
g_free (thread_data_2); thread_data_4 = pad_push (src1, gst_buffer_new (), 4 * GST_SECOND);
g_free (thread_data_3);
/* push again on all src so that the buffer on src2 is collected */ g_thread_join (thread_data_2->thread);
thread_data_1 = pad_push (src1, gst_buffer_new (), 4 * GST_SECOND);
thread_data_2 = pad_push (src2, gst_buffer_new (), 5 * GST_SECOND);
thread_data_3 = pad_push (src3, gst_buffer_new (), 6 * GST_SECOND);
g_thread_join (thread_data_1->thread);
fail_unless (test_data.sink_event != NULL); fail_unless (test_data.sink_event != NULL);
gst_element_set_state (mpegtsmux, GST_STATE_NULL); gst_element_set_state (mpegtsmux, GST_STATE_NULL);
g_thread_join (thread_data_2->thread);
g_thread_join (thread_data_3->thread); g_thread_join (thread_data_3->thread);
g_thread_join (thread_data_4->thread);
g_free (thread_data_1); g_free (thread_data_1);
g_free (thread_data_2); g_free (thread_data_2);
g_free (thread_data_3); g_free (thread_data_3);
g_free (thread_data_4);
gst_object_unref (src1); gst_object_unref (src1);
gst_object_unref (src2); gst_object_unref (src2);
gst_object_unref (src3); gst_object_unref (src3);
@ -242,7 +235,7 @@ GST_START_TEST (test_force_key_unit_event_upstream)
gboolean all_headers = TRUE; gboolean all_headers = TRUE;
gint count = 0; gint count = 0;
TestData test_data = { 0, }; TestData test_data = { 0, };
ThreadData *thread_data_1, *thread_data_2, *thread_data_3; ThreadData *thread_data_1, *thread_data_2, *thread_data_3, *thread_data_4;
mpegtsmux = gst_check_setup_element ("mpegtsmux"); mpegtsmux = gst_check_setup_element ("mpegtsmux");
gst_element_set_state (mpegtsmux, GST_STATE_PLAYING); gst_element_set_state (mpegtsmux, GST_STATE_PLAYING);
@ -281,30 +274,23 @@ GST_START_TEST (test_force_key_unit_event_upstream)
thread_data_3 = pad_push (src3, gst_buffer_new (), 3 * GST_SECOND); thread_data_3 = pad_push (src3, gst_buffer_new (), 3 * GST_SECOND);
g_thread_join (thread_data_1->thread); g_thread_join (thread_data_1->thread);
g_thread_join (thread_data_2->thread);
g_thread_join (thread_data_3->thread);
fail_unless (test_data.sink_event == NULL); fail_unless (test_data.sink_event == NULL);
g_free (thread_data_1); /* push again on src1 so that the buffer on src2 is collected */
g_free (thread_data_2); thread_data_4 = pad_push (src1, gst_buffer_new (), 4 * GST_SECOND);
g_free (thread_data_3);
/* push again on all src so that the buffer on src2 is collected */ g_thread_join (thread_data_2->thread);
thread_data_1 = pad_push (src1, gst_buffer_new (), 4 * GST_SECOND);
thread_data_2 = pad_push (src2, gst_buffer_new (), 5 * GST_SECOND);
thread_data_3 = pad_push (src3, gst_buffer_new (), 6 * GST_SECOND);
g_thread_join (thread_data_1->thread);
fail_unless (test_data.sink_event != NULL); fail_unless (test_data.sink_event != NULL);
gst_element_set_state (mpegtsmux, GST_STATE_NULL); gst_element_set_state (mpegtsmux, GST_STATE_NULL);
g_thread_join (thread_data_2->thread);
g_thread_join (thread_data_3->thread); g_thread_join (thread_data_3->thread);
g_thread_join (thread_data_4->thread);
g_free (thread_data_1); g_free (thread_data_1);
g_free (thread_data_2); g_free (thread_data_2);
g_free (thread_data_3); g_free (thread_data_3);
g_free (thread_data_4);
gst_object_unref (src1); gst_object_unref (src1);
gst_object_unref (src2); gst_object_unref (src2);