From a69a438d6c2b79695e8c84d9d17c0cb9f170f149 Mon Sep 17 00:00:00 2001 From: Thomas Vander Stichele Date: Sun, 12 Feb 2012 22:28:31 +0100 Subject: [PATCH] fix up tests --- tests/check/elements/multifdsink.c | 16 ++++++++-------- tests/check/elements/multisocketsink.c | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/tests/check/elements/multifdsink.c b/tests/check/elements/multifdsink.c index 8822d1c5fb..2665f19464 100644 --- a/tests/check/elements/multifdsink.c +++ b/tests/check/elements/multifdsink.c @@ -185,13 +185,13 @@ gst_multifdsink_create_streamheader (const gchar * data1, fail_if (hbuf2 == NULL); fail_if (caps == NULL); - /* create caps with streamheader, set the caps, and push the IN_CAPS + /* create caps with streamheader, set the caps, and push the HEADER * buffers */ *hbuf1 = gst_buffer_new_and_alloc (size1); - GST_BUFFER_FLAG_SET (*hbuf1, GST_BUFFER_FLAG_IN_CAPS); + GST_BUFFER_FLAG_SET (*hbuf1, GST_BUFFER_FLAG_HEADER); gst_buffer_fill (*hbuf1, 0, data1, size1); *hbuf2 = gst_buffer_new_and_alloc (size2); - GST_BUFFER_FLAG_SET (*hbuf2, GST_BUFFER_FLAG_IN_CAPS); + GST_BUFFER_FLAG_SET (*hbuf2, GST_BUFFER_FLAG_HEADER); gst_buffer_fill (*hbuf2, 0, data2, size2); g_value_init (&array, GST_TYPE_ARRAY); @@ -231,7 +231,7 @@ gst_multifdsink_create_streamheader (const gchar * data1, /* this test: * - adds a first client * - sets streamheader caps on the pad - * - pushes the IN_CAPS buffers + * - pushes the HEADER buffers * - pushes a buffer * - verifies that the client received all the data correctly, and did not * get multiple copies of the streamheader @@ -258,7 +258,7 @@ GST_START_TEST (test_streamheader) g_signal_emit_by_name (sink, "add", pfd1[1]); fail_unless_num_handles (sink, 1); - /* create caps with streamheader, set the caps, and push the IN_CAPS + /* create caps with streamheader, set the caps, and push the HEADER * buffers */ gst_multifdsink_create_streamheader ("babe", "deadbeef", &hbuf1, &hbuf2, &caps); @@ -273,7 +273,7 @@ GST_START_TEST (test_streamheader) //FIXME: //fail_if_can_read ("first client", pfd1[0]); - /* push a non-IN_CAPS buffer, this should trigger the client receiving the + /* push a non-HEADER buffer, this should trigger the client receiving the * first three buffers */ buf = gst_buffer_new_and_alloc (4); gst_buffer_fill (buf, 0, "f00d", 4); @@ -328,7 +328,7 @@ GST_END_TEST; /* this tests changing of streamheaders * - set streamheader caps on the pad - * - pushes the IN_CAPS buffers + * - pushes the HEADER buffers * - pushes a buffer * - add a first client * - verifies that this first client receives the first streamheader caps, @@ -350,7 +350,7 @@ GST_START_TEST (test_change_streamheader) ASSERT_SET_STATE (sink, GST_STATE_PLAYING, GST_STATE_CHANGE_ASYNC); - /* create caps with streamheader, set the caps, and push the IN_CAPS + /* create caps with streamheader, set the caps, and push the HEADER * buffers */ gst_multifdsink_create_streamheader ("first", "header", &hbuf1, &hbuf2, &caps); diff --git a/tests/check/elements/multisocketsink.c b/tests/check/elements/multisocketsink.c index 5eb52047d2..9760bd2b44 100644 --- a/tests/check/elements/multisocketsink.c +++ b/tests/check/elements/multisocketsink.c @@ -218,13 +218,13 @@ gst_multisocketsink_create_streamheader (const gchar * data1, fail_if (hbuf2 == NULL); fail_if (caps == NULL); - /* create caps with streamheader, set the caps, and push the IN_CAPS + /* create caps with streamheader, set the caps, and push the HEADER * buffers */ *hbuf1 = gst_buffer_new_and_alloc (size1); - GST_BUFFER_FLAG_SET (*hbuf1, GST_BUFFER_FLAG_IN_CAPS); + GST_BUFFER_FLAG_SET (*hbuf1, GST_BUFFER_FLAG_HEADER); gst_buffer_fill (*hbuf1, 0, data1, size1); *hbuf2 = gst_buffer_new_and_alloc (size2); - GST_BUFFER_FLAG_SET (*hbuf2, GST_BUFFER_FLAG_IN_CAPS); + GST_BUFFER_FLAG_SET (*hbuf2, GST_BUFFER_FLAG_HEADER); gst_buffer_fill (*hbuf2, 0, data2, size2); g_value_init (&array, GST_TYPE_ARRAY); @@ -264,7 +264,7 @@ gst_multisocketsink_create_streamheader (const gchar * data1, /* this test: * - adds a first client * - sets streamheader caps on the pad - * - pushes the IN_CAPS buffers + * - pushes the HEADER buffers * - pushes a buffer * - verifies that the client received all the data correctly, and did not * get multiple copies of the streamheader @@ -291,7 +291,7 @@ GST_START_TEST (test_streamheader) g_signal_emit_by_name (sink, "add", socket[0]); fail_unless_num_handles (sink, 1); - /* create caps with streamheader, set the caps, and push the IN_CAPS + /* create caps with streamheader, set the caps, and push the HEADER * buffers */ gst_multisocketsink_create_streamheader ("babe", "deadbeef", &hbuf1, &hbuf2, &caps); @@ -312,7 +312,7 @@ GST_START_TEST (test_streamheader) //FIXME: //fail_if_can_read ("first client", socket[1]); - /* push a non-IN_CAPS buffer, this should trigger the client receiving the + /* push a non-HEADER buffer, this should trigger the client receiving the * first three buffers */ buf = gst_buffer_new_and_alloc (4); gst_buffer_fill (buf, 0, "f00d", 4); @@ -367,7 +367,7 @@ GST_END_TEST; /* this tests changing of streamheaders * - set streamheader caps on the pad - * - pushes the IN_CAPS buffers + * - pushes the HEADER buffers * - pushes a buffer * - add a first client * - verifies that this first client receives the first streamheader caps, @@ -389,7 +389,7 @@ GST_START_TEST (test_change_streamheader) ASSERT_SET_STATE (sink, GST_STATE_PLAYING, GST_STATE_CHANGE_ASYNC); - /* create caps with streamheader, set the caps, and push the IN_CAPS + /* create caps with streamheader, set the caps, and push the HEADER * buffers */ gst_multisocketsink_create_streamheader ("first", "header", &hbuf1, &hbuf2, &caps);