From cd3eeed6b3bc19152e0f7c87d3cd03208195f6fd Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sebastian=20Dr=C3=B6ge?= Date: Mon, 16 Jan 2012 11:25:54 +0100 Subject: [PATCH] tcp: Remove remaining unused stuff --- configure.ac | 14 - m4/gst-fionread.m4 | 42 -- tests/check/Makefile.am | 1 - tests/check/elements/multifdsink.c | 866 ------------------------------------- 4 files changed, 923 deletions(-) delete mode 100644 m4/gst-fionread.m4 delete mode 100644 tests/check/elements/multifdsink.c diff --git a/configure.ac b/configure.ac index 30f5f56..53cc825 100644 --- a/configure.ac +++ b/configure.ac @@ -185,11 +185,6 @@ AC_COMPILE_IFELSE( CPPFLAGS="$ac_cppflags_save" AM_CONDITIONAL(HAVE_LIBXML_HTML, test "x$HAVE_LIBXML_HTML" = "xyes") -dnl used in gst/tcp -AC_CHECK_HEADERS([sys/socket.h], - HAVE_SYS_SOCKET_H="yes", HAVE_SYS_SOCKET_H="no") -AM_CONDITIONAL(HAVE_SYS_SOCKET_H, test "x$HAVE_SYS_SOCKET_H" = "xyes") - dnl used in gst-libs/gst/rtsp AC_CHECK_HEADERS([winsock2.h], HAVE_WINSOCK2_H=yes) if test "x$HAVE_WINSOCK2_H" = "xyes"; then @@ -224,10 +219,6 @@ LIBS=$LIBS_SAVE dnl *** checks for types/defines *** -dnl Check for FIONREAD ioctl declaration -dnl used in gst/tcp -GST_CHECK_FIONREAD - dnl *** checks for structures *** dnl *** checks for compiler characteristics *** @@ -433,11 +424,6 @@ if test "x$HAVE_LIBXML_HTML" != "xyes"; then AG_GST_DISABLE_PLUGIN(subparse) fi -dnl disable plug-ins that require sys/socket.h if it is not available -if test "x$HAVE_SYS_SOCKET_H" != "xyes"; then - AG_GST_DISABLE_PLUGIN(tcp) -fi - dnl iso-codes is optional, used by libgsttag AC_ARG_ENABLE(iso-codes, AC_HELP_STRING([--enable-iso-codes],[use iso-codes if installed]), diff --git a/m4/gst-fionread.m4 b/m4/gst-fionread.m4 deleted file mode 100644 index 603aa45..0000000 --- a/m4/gst-fionread.m4 +++ /dev/null @@ -1,42 +0,0 @@ -AC_DEFUN([GST_CHECK_FIONREAD], [ - - AC_MSG_CHECKING(for FIONREAD in sys/ioctl.h) - AC_CACHE_VAL(_cv_gst_fionread_in_sys_ioctl, [ - AC_TRY_COMPILE([ -#include -#include -], [ -int x = FIONREAD; -if ( x ) - return 0; - ], _cv_gst_fionread_in_sys_ioctl="yes",_cv_gst_fionread_in_sys_ioctl="no") - ]) - - AC_MSG_RESULT($_cv_gst_fionread_in_sys_ioctl) - - if test "$_cv_gst_fionread_in_sys_ioctl" = "yes"; then - AC_DEFINE([HAVE_FIONREAD_IN_SYS_IOCTL], 1, [FIONREAD ioctl found in sys/ioclt.h]) - - else - - AC_MSG_CHECKING(for FIONREAD in sys/filio.h) - AC_CACHE_VAL(_cv_gst_fionread_in_sys_filio, [ - AC_TRY_COMPILE([ - #include - #include - ], [ - int x = FIONREAD; - if ( x ) - return 0; - ], _cv_gst_fionread_in_sys_filio="yes",_cv_gst_fionread_in_sys_filio="no") - ]) - - AC_MSG_RESULT($_cv_gst_fionread_in_sys_filio) - - if test "$_cv_gst_fionread_in_sys_filio" = "yes"; then - AC_DEFINE([HAVE_FIONREAD_IN_SYS_FILIO], 1, [FIONREAD ioctl found in sys/filio.h]) - fi - - fi - -]) diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am index 6d6a15b..2470f17 100644 --- a/tests/check/Makefile.am +++ b/tests/check/Makefile.am @@ -138,7 +138,6 @@ check_PROGRAMS = \ elements/audioresample \ elements/gdpdepay \ elements/gdppay \ - elements/multifdsink \ elements/playbin \ elements/playbin-compressed \ $(check_pango) \ diff --git a/tests/check/elements/multifdsink.c b/tests/check/elements/multifdsink.c deleted file mode 100644 index 6d5a252..0000000 --- a/tests/check/elements/multifdsink.c +++ /dev/null @@ -1,866 +0,0 @@ -/* GStreamer - * - * Copyright (C) 2006 Thomas Vander Stichele - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#include -#include -#ifdef HAVE_FIONREAD_IN_SYS_FILIO -#include -#endif - -#include - -static GstPad *mysrcpad; - -static GstStaticPadTemplate srctemplate = GST_STATIC_PAD_TEMPLATE ("src", - GST_PAD_SRC, - GST_PAD_ALWAYS, - GST_STATIC_CAPS ("application/x-gst-check") - ); - -static GstElement * -setup_multifdsink (void) -{ - GstElement *multifdsink; - - GST_DEBUG ("setup_multifdsink"); - multifdsink = gst_check_setup_element ("multifdsink"); - mysrcpad = gst_check_setup_src_pad (multifdsink, &srctemplate); - - return multifdsink; -} - -static void -cleanup_multifdsink (GstElement * multifdsink) -{ - GST_DEBUG ("cleanup_multifdsink"); - - gst_check_teardown_src_pad (multifdsink); - gst_check_teardown_element (multifdsink); -} - -static void -wait_bytes_served (GstElement * sink, guint64 bytes) -{ - guint64 bytes_served = 0; - - while (bytes_served != bytes) { - g_object_get (sink, "bytes-served", &bytes_served, NULL); - } -} - -/* FIXME: possibly racy, since if it would write, we may not get it - * immediately ? */ -#define fail_if_can_read(msg,fd) \ -G_STMT_START { \ - long avail; \ -\ - fail_if (ioctl (fd, FIONREAD, &avail) < 0, "%s: could not ioctl", msg); \ - fail_if (avail > 0, "%s: has bytes available to read"); \ -} G_STMT_END; - - -GST_START_TEST (test_no_clients) -{ - GstElement *sink; - GstBuffer *buffer; - GstCaps *caps; - - sink = setup_multifdsink (); - - ASSERT_SET_STATE (sink, GST_STATE_PLAYING, GST_STATE_CHANGE_ASYNC); - - caps = gst_caps_from_string ("application/x-gst-check"); - buffer = gst_buffer_new_and_alloc (4); - gst_pad_set_caps (mysrcpad, caps); - gst_caps_unref (caps); - fail_unless (gst_pad_push (mysrcpad, buffer) == GST_FLOW_OK); - - GST_DEBUG ("cleaning up multifdsink"); - ASSERT_SET_STATE (sink, GST_STATE_NULL, GST_STATE_CHANGE_SUCCESS); - cleanup_multifdsink (sink); -} - -GST_END_TEST; - -GST_START_TEST (test_add_client) -{ - GstElement *sink; - GstBuffer *buffer; - GstCaps *caps; - int pfd[2]; - gchar data[4]; - - sink = setup_multifdsink (); - - fail_if (pipe (pfd) == -1); - - ASSERT_SET_STATE (sink, GST_STATE_PLAYING, GST_STATE_CHANGE_ASYNC); - - /* add the client */ - g_signal_emit_by_name (sink, "add", pfd[1]); - - caps = gst_caps_from_string ("application/x-gst-check"); - GST_DEBUG ("Created test caps %p %" GST_PTR_FORMAT, caps, caps); - buffer = gst_buffer_new_and_alloc (4); - gst_pad_set_caps (mysrcpad, caps); - ASSERT_CAPS_REFCOUNT (caps, "caps", 2); - gst_buffer_fill (buffer, 0, "dead", 4); - fail_unless (gst_pad_push (mysrcpad, buffer) == GST_FLOW_OK); - - GST_DEBUG ("reading"); - fail_if (read (pfd[0], data, 4) < 4); - fail_unless (strncmp (data, "dead", 4) == 0); - wait_bytes_served (sink, 4); - - GST_DEBUG ("cleaning up multifdsink"); - ASSERT_SET_STATE (sink, GST_STATE_NULL, GST_STATE_CHANGE_SUCCESS); - cleanup_multifdsink (sink); - - ASSERT_CAPS_REFCOUNT (caps, "caps", 1); - gst_caps_unref (caps); -} - -GST_END_TEST; - -#define fail_unless_read(msg,fd,size,ref) \ -G_STMT_START { \ - char data[size + 1]; \ - int nbytes; \ -\ - GST_DEBUG ("%s: reading %d bytes", msg, size); \ - nbytes = read (fd, data, size); \ - data[size] = 0; \ - GST_DEBUG ("%s: read %d bytes", msg, nbytes); \ - fail_if (nbytes < size); \ - fail_unless (memcmp (data, ref, size) == 0, \ - "data read '%s' differs from '%s'", data, ref); \ -} G_STMT_END; - -/* from the given two data buffers, create two streamheader buffers and - * some caps that match it, and store them in the given pointers - * returns one ref to each of the buffers and the caps */ -static void -gst_multifdsink_create_streamheader (const gchar * data1, - const gchar * data2, GstBuffer ** hbuf1, GstBuffer ** hbuf2, - GstCaps ** caps) -{ - GstBuffer *buf; - GValue array = { 0 }; - GValue value = { 0 }; - GstStructure *structure; - guint size1 = strlen (data1); - guint size2 = strlen (data2); - - fail_if (hbuf1 == NULL); - fail_if (hbuf2 == NULL); - fail_if (caps == NULL); - - /* create caps with streamheader, set the caps, and push the IN_CAPS - * buffers */ - *hbuf1 = gst_buffer_new_and_alloc (size1); - GST_BUFFER_FLAG_SET (*hbuf1, GST_BUFFER_FLAG_IN_CAPS); - 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_fill (*hbuf2, 0, data2, size2); - - g_value_init (&array, GST_TYPE_ARRAY); - - g_value_init (&value, GST_TYPE_BUFFER); - /* we take a copy, set it on the array (which refs it), then unref our copy */ - buf = gst_buffer_copy (*hbuf1); - gst_value_set_buffer (&value, buf); - ASSERT_BUFFER_REFCOUNT (buf, "copied buffer", 2); - gst_buffer_unref (buf); - gst_value_array_append_value (&array, &value); - g_value_unset (&value); - - g_value_init (&value, GST_TYPE_BUFFER); - buf = gst_buffer_copy (*hbuf2); - gst_value_set_buffer (&value, buf); - ASSERT_BUFFER_REFCOUNT (buf, "copied buffer", 2); - gst_buffer_unref (buf); - gst_value_array_append_value (&array, &value); - g_value_unset (&value); - - *caps = gst_caps_from_string ("application/x-gst-check"); - structure = gst_caps_get_structure (*caps, 0); - - gst_structure_set_value (structure, "streamheader", &array); - g_value_unset (&array); - ASSERT_CAPS_REFCOUNT (*caps, "streamheader caps", 1); - - /* we want to keep them around for the tests */ - gst_buffer_ref (*hbuf1); - gst_buffer_ref (*hbuf2); - - GST_DEBUG ("created streamheader caps %p %" GST_PTR_FORMAT, *caps, *caps); -} - - -/* this test: - * - adds a first client - * - sets streamheader caps on the pad - * - pushes the IN_CAPS buffers - * - pushes a buffer - * - verifies that the client received all the data correctly, and did not - * get multiple copies of the streamheader - * - adds a second client - * - verifies that this second client receives the streamheader caps too, plus - * - the new buffer - */ -GST_START_TEST (test_streamheader) -{ - GstElement *sink; - GstBuffer *hbuf1, *hbuf2, *buf; - GstCaps *caps; - int pfd1[2], pfd2[2]; - - sink = setup_multifdsink (); - - fail_if (pipe (pfd1) == -1); - fail_if (pipe (pfd2) == -1); - - ASSERT_SET_STATE (sink, GST_STATE_PLAYING, GST_STATE_CHANGE_ASYNC); - - /* add the first client */ - g_signal_emit_by_name (sink, "add", pfd1[1]); - - /* create caps with streamheader, set the caps, and push the IN_CAPS - * buffers */ - gst_multifdsink_create_streamheader ("babe", "deadbeef", &hbuf1, &hbuf2, - &caps); - fail_unless (gst_pad_set_caps (mysrcpad, caps)); - /* one is ours, two on the buffers, and one now on the pad */ - ASSERT_CAPS_REFCOUNT (caps, "caps", 4); - - fail_unless (gst_pad_push (mysrcpad, hbuf1) == GST_FLOW_OK); - fail_unless (gst_pad_push (mysrcpad, hbuf2) == GST_FLOW_OK); - - //FIXME: - //fail_if_can_read ("first client", pfd1[0]); - - /* push a non-IN_CAPS 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); - gst_pad_push (mysrcpad, buf); - - fail_unless_read ("first client", pfd1[0], 4, "babe"); - fail_unless_read ("first client", pfd1[0], 8, "deadbeef"); - fail_unless_read ("first client", pfd1[0], 4, "f00d"); - wait_bytes_served (sink, 16); - - /* now add the second client */ - g_signal_emit_by_name (sink, "add", pfd2[1]); - //FIXME: - //fail_if_can_read ("second client", pfd2[0]); - - /* now push another buffer, which will trigger streamheader for second - * client */ - buf = gst_buffer_new_and_alloc (4); - gst_buffer_fill (buf, 0, "deaf", 4); - gst_pad_push (mysrcpad, buf); - - fail_unless_read ("first client", pfd1[0], 4, "deaf"); - - fail_unless_read ("second client", pfd2[0], 4, "babe"); - fail_unless_read ("second client", pfd2[0], 8, "deadbeef"); - /* we missed the f00d buffer */ - fail_unless_read ("second client", pfd2[0], 4, "deaf"); - wait_bytes_served (sink, 36); - - GST_DEBUG ("cleaning up multifdsink"); - - g_signal_emit_by_name (sink, "remove", pfd1[1]); - g_signal_emit_by_name (sink, "remove", pfd2[1]); - - ASSERT_SET_STATE (sink, GST_STATE_NULL, GST_STATE_CHANGE_SUCCESS); - cleanup_multifdsink (sink); - - ASSERT_BUFFER_REFCOUNT (hbuf1, "hbuf1", 1); - ASSERT_BUFFER_REFCOUNT (hbuf2, "hbuf2", 1); - gst_buffer_unref (hbuf1); - gst_buffer_unref (hbuf2); - - ASSERT_CAPS_REFCOUNT (caps, "caps", 1); - gst_caps_unref (caps); -} - -GST_END_TEST; - -/* this tests changing of streamheaders - * - set streamheader caps on the pad - * - pushes the IN_CAPS buffers - * - pushes a buffer - * - add a first client - * - verifies that this first client receives the first streamheader caps, - * plus a new buffer - * - change streamheader caps - * - verify that the first client receives the new streamheader buffers as well - */ -GST_START_TEST (test_change_streamheader) -{ - GstElement *sink; - GstBuffer *hbuf1, *hbuf2, *buf; - GstCaps *caps; - int pfd1[2], pfd2[2]; - - sink = setup_multifdsink (); - - fail_if (pipe (pfd1) == -1); - fail_if (pipe (pfd2) == -1); - - ASSERT_SET_STATE (sink, GST_STATE_PLAYING, GST_STATE_CHANGE_ASYNC); - - /* create caps with streamheader, set the caps, and push the IN_CAPS - * buffers */ - gst_multifdsink_create_streamheader ("first", "header", &hbuf1, &hbuf2, - &caps); - fail_unless (gst_pad_set_caps (mysrcpad, caps)); - /* one is ours, two on the buffers, and one now on the pad */ - ASSERT_CAPS_REFCOUNT (caps, "caps", 4); - - /* one to hold for the test and one to give away */ - ASSERT_BUFFER_REFCOUNT (hbuf1, "hbuf1", 2); - ASSERT_BUFFER_REFCOUNT (hbuf2, "hbuf2", 2); - - fail_unless (gst_pad_push (mysrcpad, hbuf1) == GST_FLOW_OK); - fail_unless (gst_pad_push (mysrcpad, hbuf2) == GST_FLOW_OK); - - /* add the first client */ - g_signal_emit_by_name (sink, "add", pfd1[1]); - - /* verify this hasn't triggered a write yet */ - /* FIXME: possibly racy, since if it would write, we may not get it - * immediately ? */ - //fail_if_can_read ("first client, no buffer", pfd1[0]); - - /* now push a buffer and read */ - buf = gst_buffer_new_and_alloc (4); - gst_buffer_fill (buf, 0, "f00d", 4); - gst_pad_push (mysrcpad, buf); - - fail_unless_read ("change: first client", pfd1[0], 5, "first"); - fail_unless_read ("change: first client", pfd1[0], 6, "header"); - fail_unless_read ("change: first client", pfd1[0], 4, "f00d"); - //wait_bytes_served (sink, 16); - - /* now add the second client */ - g_signal_emit_by_name (sink, "add", pfd2[1]); - //fail_if_can_read ("second client, no buffer", pfd2[0]); - - /* change the streamheader */ - - /* before we change, multifdsink still has a list of the old streamheaders */ - ASSERT_BUFFER_REFCOUNT (hbuf1, "hbuf1", 2); - ASSERT_BUFFER_REFCOUNT (hbuf2, "hbuf2", 2); - gst_buffer_unref (hbuf1); - gst_buffer_unref (hbuf2); - - /* drop our ref to the previous caps */ - gst_caps_unref (caps); - - gst_multifdsink_create_streamheader ("second", "header", &hbuf1, &hbuf2, - &caps); - fail_unless (gst_pad_set_caps (mysrcpad, caps)); - /* one to hold for the test and one to give away */ - ASSERT_BUFFER_REFCOUNT (hbuf1, "hbuf1", 2); - ASSERT_BUFFER_REFCOUNT (hbuf2, "hbuf2", 2); - - fail_unless (gst_pad_push (mysrcpad, hbuf1) == GST_FLOW_OK); - fail_unless (gst_pad_push (mysrcpad, hbuf2) == GST_FLOW_OK); - - /* verify neither client has new data available to read */ - //fail_if_can_read ("first client, changed streamheader", pfd1[0]); - //fail_if_can_read ("second client, changed streamheader", pfd2[0]); - - /* now push another buffer, which will trigger streamheader for second - * client, but should also send new streamheaders to first client */ - buf = gst_buffer_new_and_alloc (8); - gst_buffer_fill (buf, 0, "deadbabe", 8); - gst_pad_push (mysrcpad, buf); - - fail_unless_read ("first client", pfd1[0], 6, "second"); - fail_unless_read ("first client", pfd1[0], 6, "header"); - fail_unless_read ("first client", pfd1[0], 8, "deadbabe"); - - /* new streamheader data */ - fail_unless_read ("second client", pfd2[0], 6, "second"); - fail_unless_read ("second client", pfd2[0], 6, "header"); - /* we missed the f00d buffer */ - fail_unless_read ("second client", pfd2[0], 8, "deadbabe"); - //wait_bytes_served (sink, 36); - - GST_DEBUG ("cleaning up multifdsink"); - g_signal_emit_by_name (sink, "remove", pfd1[1]); - g_signal_emit_by_name (sink, "remove", pfd2[1]); - ASSERT_SET_STATE (sink, GST_STATE_NULL, GST_STATE_CHANGE_SUCCESS); - - /* setting to NULL should have cleared the streamheader */ - ASSERT_BUFFER_REFCOUNT (hbuf1, "hbuf1", 1); - ASSERT_BUFFER_REFCOUNT (hbuf2, "hbuf2", 1); - gst_buffer_unref (hbuf1); - gst_buffer_unref (hbuf2); - cleanup_multifdsink (sink); - - ASSERT_CAPS_REFCOUNT (caps, "caps", 1); - gst_caps_unref (caps); -} - -GST_END_TEST; - -/* keep 100 bytes and burst 80 bytes to clients */ -GST_START_TEST (test_burst_client_bytes) -{ - GstElement *sink; - GstBuffer *buffer; - GstCaps *caps; - int pfd1[2]; - int pfd2[2]; - int pfd3[2]; - gchar data[16]; - gint i; - guint buffers_queued; - - sink = setup_multifdsink (); - /* make sure we keep at least 100 bytes at all times */ - g_object_set (sink, "bytes-min", 100, NULL); - g_object_set (sink, "sync-method", 3, NULL); /* 3 = burst */ - g_object_set (sink, "burst-unit", 3, NULL); /* 3 = bytes */ - g_object_set (sink, "burst-value", (guint64) 80, NULL); - - fail_if (pipe (pfd1) == -1); - fail_if (pipe (pfd2) == -1); - fail_if (pipe (pfd3) == -1); - - ASSERT_SET_STATE (sink, GST_STATE_PLAYING, GST_STATE_CHANGE_ASYNC); - - caps = gst_caps_from_string ("application/x-gst-check"); - gst_pad_set_caps (mysrcpad, caps); - GST_DEBUG ("Created test caps %p %" GST_PTR_FORMAT, caps, caps); - - /* push buffers in, 9 * 16 bytes = 144 bytes */ - for (i = 0; i < 9; i++) { - gchar *data; - - buffer = gst_buffer_new_and_alloc (16); - - /* copy some id */ - data = gst_buffer_map (buffer, NULL, NULL, GST_MAP_WRITE); - g_snprintf (data, 16, "deadbee%08x", i); - gst_buffer_unmap (buffer, data, 16); - - fail_unless (gst_pad_push (mysrcpad, buffer) == GST_FLOW_OK); - } - - /* check that at least 7 buffers (112 bytes) are in the queue */ - g_object_get (sink, "buffers-queued", &buffers_queued, NULL); - fail_if (buffers_queued != 7); - - /* now add the clients */ - g_signal_emit_by_name (sink, "add", pfd1[1]); - g_signal_emit_by_name (sink, "add_full", pfd2[1], 3, - 3, (guint64) 50, 3, (guint64) 200); - g_signal_emit_by_name (sink, "add_full", pfd3[1], 3, - 3, (guint64) 50, 3, (guint64) 50); - - /* push last buffer to make client fds ready for reading */ - for (i = 9; i < 10; i++) { - gchar *data; - - buffer = gst_buffer_new_and_alloc (16); - - /* copy some id */ - data = gst_buffer_map (buffer, NULL, NULL, GST_MAP_WRITE); - g_snprintf (data, 16, "deadbee%08x", i); - gst_buffer_unmap (buffer, data, 16); - - fail_unless (gst_pad_push (mysrcpad, buffer) == GST_FLOW_OK); - } - - /* now we should only read the last 5 buffers (5 * 16 = 80 bytes) */ - GST_DEBUG ("Reading from client 1"); - fail_if (read (pfd1[0], data, 16) < 16); - fail_unless (strncmp (data, "deadbee00000005", 16) == 0); - fail_if (read (pfd1[0], data, 16) < 16); - fail_unless (strncmp (data, "deadbee00000006", 16) == 0); - fail_if (read (pfd1[0], data, 16) < 16); - fail_unless (strncmp (data, "deadbee00000007", 16) == 0); - fail_if (read (pfd1[0], data, 16) < 16); - fail_unless (strncmp (data, "deadbee00000008", 16) == 0); - fail_if (read (pfd1[0], data, 16) < 16); - fail_unless (strncmp (data, "deadbee00000009", 16) == 0); - - /* second client only bursts 50 bytes = 4 buffers (we get 4 buffers since - * the max alows it) */ - GST_DEBUG ("Reading from client 2"); - fail_if (read (pfd2[0], data, 16) < 16); - fail_unless (strncmp (data, "deadbee00000006", 16) == 0); - fail_if (read (pfd2[0], data, 16) < 16); - fail_unless (strncmp (data, "deadbee00000007", 16) == 0); - fail_if (read (pfd2[0], data, 16) < 16); - fail_unless (strncmp (data, "deadbee00000008", 16) == 0); - fail_if (read (pfd2[0], data, 16) < 16); - fail_unless (strncmp (data, "deadbee00000009", 16) == 0); - - /* third client only bursts 50 bytes = 4 buffers, we can't send - * more than 50 bytes so we only get 3 buffers (48 bytes). */ - GST_DEBUG ("Reading from client 3"); - fail_if (read (pfd3[0], data, 16) < 16); - fail_unless (strncmp (data, "deadbee00000007", 16) == 0); - fail_if (read (pfd3[0], data, 16) < 16); - fail_unless (strncmp (data, "deadbee00000008", 16) == 0); - fail_if (read (pfd3[0], data, 16) < 16); - fail_unless (strncmp (data, "deadbee00000009", 16) == 0); - - GST_DEBUG ("cleaning up multifdsink"); - ASSERT_SET_STATE (sink, GST_STATE_NULL, GST_STATE_CHANGE_SUCCESS); - cleanup_multifdsink (sink); - - ASSERT_CAPS_REFCOUNT (caps, "caps", 1); - gst_caps_unref (caps); -} - -GST_END_TEST; - -/* keep 100 bytes and burst 80 bytes to clients */ -GST_START_TEST (test_burst_client_bytes_keyframe) -{ - GstElement *sink; - GstBuffer *buffer; - GstCaps *caps; - int pfd1[2]; - int pfd2[2]; - int pfd3[2]; - gchar data[16]; - gint i; - guint buffers_queued; - - sink = setup_multifdsink (); - /* make sure we keep at least 100 bytes at all times */ - g_object_set (sink, "bytes-min", 100, NULL); - g_object_set (sink, "sync-method", 4, NULL); /* 3 = burst_keyframe */ - g_object_set (sink, "burst-unit", 3, NULL); /* 3 = bytes */ - g_object_set (sink, "burst-value", (guint64) 80, NULL); - - fail_if (pipe (pfd1) == -1); - fail_if (pipe (pfd2) == -1); - fail_if (pipe (pfd3) == -1); - - ASSERT_SET_STATE (sink, GST_STATE_PLAYING, GST_STATE_CHANGE_ASYNC); - - caps = gst_caps_from_string ("application/x-gst-check"); - GST_DEBUG ("Created test caps %p %" GST_PTR_FORMAT, caps, caps); - gst_pad_set_caps (mysrcpad, caps); - - /* push buffers in, 9 * 16 bytes = 144 bytes */ - for (i = 0; i < 9; i++) { - gchar *data; - - buffer = gst_buffer_new_and_alloc (16); - - /* mark most buffers as delta */ - if (i != 0 && i != 4 && i != 8) - GST_BUFFER_FLAG_SET (buffer, GST_BUFFER_FLAG_DELTA_UNIT); - - /* copy some id */ - data = gst_buffer_map (buffer, NULL, NULL, GST_MAP_WRITE); - g_snprintf (data, 16, "deadbee%08x", i); - gst_buffer_unmap (buffer, data, 16); - - fail_unless (gst_pad_push (mysrcpad, buffer) == GST_FLOW_OK); - } - - /* check that at least 7 buffers (112 bytes) are in the queue */ - g_object_get (sink, "buffers-queued", &buffers_queued, NULL); - fail_if (buffers_queued != 7); - - /* now add the clients */ - g_signal_emit_by_name (sink, "add", pfd1[1]); - g_signal_emit_by_name (sink, "add_full", pfd2[1], 4, - 3, (guint64) 50, 3, (guint64) 90); - g_signal_emit_by_name (sink, "add_full", pfd3[1], 4, - 3, (guint64) 50, 3, (guint64) 50); - - /* push last buffer to make client fds ready for reading */ - for (i = 9; i < 10; i++) { - gchar *data; - - buffer = gst_buffer_new_and_alloc (16); - GST_BUFFER_FLAG_SET (buffer, GST_BUFFER_FLAG_DELTA_UNIT); - - /* copy some id */ - data = gst_buffer_map (buffer, NULL, NULL, GST_MAP_WRITE); - g_snprintf (data, 16, "deadbee%08x", i); - gst_buffer_unmap (buffer, data, 16); - - fail_unless (gst_pad_push (mysrcpad, buffer) == GST_FLOW_OK); - } - - /* now we should only read the last 6 buffers (min 5 * 16 = 80 bytes), - * keyframe at buffer 4 */ - GST_DEBUG ("Reading from client 1"); - fail_if (read (pfd1[0], data, 16) < 16); - fail_unless (strncmp (data, "deadbee00000004", 16) == 0); - fail_if (read (pfd1[0], data, 16) < 16); - fail_unless (strncmp (data, "deadbee00000005", 16) == 0); - fail_if (read (pfd1[0], data, 16) < 16); - fail_unless (strncmp (data, "deadbee00000006", 16) == 0); - fail_if (read (pfd1[0], data, 16) < 16); - fail_unless (strncmp (data, "deadbee00000007", 16) == 0); - fail_if (read (pfd1[0], data, 16) < 16); - fail_unless (strncmp (data, "deadbee00000008", 16) == 0); - fail_if (read (pfd1[0], data, 16) < 16); - fail_unless (strncmp (data, "deadbee00000009", 16) == 0); - - /* second client only bursts 50 bytes = 4 buffers, there is - * no keyframe above min and below max, so get one below min */ - GST_DEBUG ("Reading from client 2"); - fail_if (read (pfd2[0], data, 16) < 16); - fail_unless (strncmp (data, "deadbee00000008", 16) == 0); - fail_if (read (pfd2[0], data, 16) < 16); - fail_unless (strncmp (data, "deadbee00000009", 16) == 0); - - /* third client only bursts 50 bytes = 4 buffers, we can't send - * more than 50 bytes so we only get 2 buffers (32 bytes). */ - GST_DEBUG ("Reading from client 3"); - fail_if (read (pfd3[0], data, 16) < 16); - fail_unless (strncmp (data, "deadbee00000008", 16) == 0); - fail_if (read (pfd3[0], data, 16) < 16); - fail_unless (strncmp (data, "deadbee00000009", 16) == 0); - - GST_DEBUG ("cleaning up multifdsink"); - ASSERT_SET_STATE (sink, GST_STATE_NULL, GST_STATE_CHANGE_SUCCESS); - cleanup_multifdsink (sink); - - ASSERT_CAPS_REFCOUNT (caps, "caps", 1); - gst_caps_unref (caps); -} - -GST_END_TEST; - -/* keep 100 bytes and burst 80 bytes to clients */ -GST_START_TEST (test_burst_client_bytes_with_keyframe) -{ - GstElement *sink; - GstBuffer *buffer; - GstCaps *caps; - int pfd1[2]; - int pfd2[2]; - int pfd3[2]; - gchar data[16]; - gint i; - guint buffers_queued; - - sink = setup_multifdsink (); - /* make sure we keep at least 100 bytes at all times */ - g_object_set (sink, "bytes-min", 100, NULL); - g_object_set (sink, "sync-method", 5, NULL); /* 3 = burst_with_keyframe */ - g_object_set (sink, "burst-unit", 3, NULL); /* 3 = bytes */ - g_object_set (sink, "burst-value", (guint64) 80, NULL); - - fail_if (pipe (pfd1) == -1); - fail_if (pipe (pfd2) == -1); - fail_if (pipe (pfd3) == -1); - - ASSERT_SET_STATE (sink, GST_STATE_PLAYING, GST_STATE_CHANGE_ASYNC); - - caps = gst_caps_from_string ("application/x-gst-check"); - gst_pad_set_caps (mysrcpad, caps); - GST_DEBUG ("Created test caps %p %" GST_PTR_FORMAT, caps, caps); - - /* push buffers in, 9 * 16 bytes = 144 bytes */ - for (i = 0; i < 9; i++) { - gchar *data; - - buffer = gst_buffer_new_and_alloc (16); - - /* mark most buffers as delta */ - if (i != 0 && i != 4 && i != 8) - GST_BUFFER_FLAG_SET (buffer, GST_BUFFER_FLAG_DELTA_UNIT); - - /* copy some id */ - data = gst_buffer_map (buffer, NULL, NULL, GST_MAP_WRITE); - g_snprintf (data, 16, "deadbee%08x", i); - gst_buffer_unmap (buffer, data, 16); - - fail_unless (gst_pad_push (mysrcpad, buffer) == GST_FLOW_OK); - } - - /* check that at least 7 buffers (112 bytes) are in the queue */ - g_object_get (sink, "buffers-queued", &buffers_queued, NULL); - fail_if (buffers_queued != 7); - - /* now add the clients */ - g_signal_emit_by_name (sink, "add", pfd1[1]); - g_signal_emit_by_name (sink, "add_full", pfd2[1], 5, - 3, (guint64) 50, 3, (guint64) 90); - g_signal_emit_by_name (sink, "add_full", pfd3[1], 5, - 3, (guint64) 50, 3, (guint64) 50); - - /* push last buffer to make client fds ready for reading */ - for (i = 9; i < 10; i++) { - gchar *data; - - buffer = gst_buffer_new_and_alloc (16); - GST_BUFFER_FLAG_SET (buffer, GST_BUFFER_FLAG_DELTA_UNIT); - - /* copy some id */ - data = gst_buffer_map (buffer, NULL, NULL, GST_MAP_WRITE); - g_snprintf (data, 16, "deadbee%08x", i); - gst_buffer_unmap (buffer, data, 16); - - fail_unless (gst_pad_push (mysrcpad, buffer) == GST_FLOW_OK); - } - - /* now we should only read the last 6 buffers (min 5 * 16 = 80 bytes), - * keyframe at buffer 4 */ - GST_DEBUG ("Reading from client 1"); - fail_if (read (pfd1[0], data, 16) < 16); - fail_unless (strncmp (data, "deadbee00000004", 16) == 0); - fail_if (read (pfd1[0], data, 16) < 16); - fail_unless (strncmp (data, "deadbee00000005", 16) == 0); - fail_if (read (pfd1[0], data, 16) < 16); - fail_unless (strncmp (data, "deadbee00000006", 16) == 0); - fail_if (read (pfd1[0], data, 16) < 16); - fail_unless (strncmp (data, "deadbee00000007", 16) == 0); - fail_if (read (pfd1[0], data, 16) < 16); - fail_unless (strncmp (data, "deadbee00000008", 16) == 0); - fail_if (read (pfd1[0], data, 16) < 16); - fail_unless (strncmp (data, "deadbee00000009", 16) == 0); - - /* second client only bursts 50 bytes = 4 buffers, there is - * no keyframe above min and below max, so send min */ - GST_DEBUG ("Reading from client 2"); - fail_if (read (pfd2[0], data, 16) < 16); - fail_unless (strncmp (data, "deadbee00000006", 16) == 0); - fail_if (read (pfd2[0], data, 16) < 16); - fail_unless (strncmp (data, "deadbee00000007", 16) == 0); - fail_if (read (pfd2[0], data, 16) < 16); - fail_unless (strncmp (data, "deadbee00000008", 16) == 0); - fail_if (read (pfd2[0], data, 16) < 16); - fail_unless (strncmp (data, "deadbee00000009", 16) == 0); - - /* third client only bursts 50 bytes = 4 buffers, we can't send - * more than 50 bytes so we only get 3 buffers (48 bytes). */ - GST_DEBUG ("Reading from client 3"); - fail_if (read (pfd3[0], data, 16) < 16); - fail_unless (strncmp (data, "deadbee00000007", 16) == 0); - fail_if (read (pfd3[0], data, 16) < 16); - fail_unless (strncmp (data, "deadbee00000008", 16) == 0); - fail_if (read (pfd3[0], data, 16) < 16); - fail_unless (strncmp (data, "deadbee00000009", 16) == 0); - - GST_DEBUG ("cleaning up multifdsink"); - ASSERT_SET_STATE (sink, GST_STATE_NULL, GST_STATE_CHANGE_SUCCESS); - cleanup_multifdsink (sink); - - ASSERT_CAPS_REFCOUNT (caps, "caps", 1); - gst_caps_unref (caps); -} - -GST_END_TEST; - -/* Check that we can get data when multifdsink is configured in next-keyframe - * mode */ -GST_START_TEST (test_client_next_keyframe) -{ - GstElement *sink; - GstBuffer *buffer; - GstCaps *caps; - int pfd1[2]; - gchar data[16]; - gint i; - - sink = setup_multifdsink (); - g_object_set (sink, "sync-method", 1, NULL); /* 1 = next-keyframe */ - - fail_if (pipe (pfd1) == -1); - - ASSERT_SET_STATE (sink, GST_STATE_PLAYING, GST_STATE_CHANGE_ASYNC); - - caps = gst_caps_from_string ("application/x-gst-check"); - gst_pad_set_caps (mysrcpad, caps); - GST_DEBUG ("Created test caps %p %" GST_PTR_FORMAT, caps, caps); - - /* now add our client */ - g_signal_emit_by_name (sink, "add", pfd1[1]); - - /* push buffers in: keyframe, then non-keyframe */ - for (i = 0; i < 2; i++) { - gchar *data; - - buffer = gst_buffer_new_and_alloc (16); - - /* copy some id */ - data = gst_buffer_map (buffer, NULL, NULL, GST_MAP_WRITE); - g_snprintf (data, 16, "deadbee%08x", i); - gst_buffer_unmap (buffer, data, 16); - if (i > 0) - GST_BUFFER_FLAG_SET (buffer, GST_BUFFER_FLAG_DELTA_UNIT); - - fail_unless (gst_pad_push (mysrcpad, buffer) == GST_FLOW_OK); - } - - /* now we should be able to read some data */ - GST_DEBUG ("Reading from client 1"); - fail_if (read (pfd1[0], data, 16) < 16); - fail_unless (strncmp (data, "deadbee00000000", 16) == 0); - fail_if (read (pfd1[0], data, 16) < 16); - fail_unless (strncmp (data, "deadbee00000001", 16) == 0); - - GST_DEBUG ("cleaning up multifdsink"); - ASSERT_SET_STATE (sink, GST_STATE_NULL, GST_STATE_CHANGE_SUCCESS); - cleanup_multifdsink (sink); - - ASSERT_CAPS_REFCOUNT (caps, "caps", 1); - gst_caps_unref (caps); -} - -GST_END_TEST; - -/* FIXME: add test simulating chained oggs where: - * sync-method is burst-on-connect - * (when multifdsink actually does burst-on-connect based on byte size, not - "last keyframe" which any frame for audio :)) - * an old client still needs to read from before the new streamheaders - * a new client gets the new streamheaders - */ -static Suite * -multifdsink_suite (void) -{ - Suite *s = suite_create ("multifdsink"); - TCase *tc_chain = tcase_create ("general"); - - suite_add_tcase (s, tc_chain); - tcase_add_test (tc_chain, test_no_clients); - tcase_add_test (tc_chain, test_add_client); - tcase_add_test (tc_chain, test_streamheader); - tcase_add_test (tc_chain, test_change_streamheader); - tcase_add_test (tc_chain, test_burst_client_bytes); - tcase_add_test (tc_chain, test_burst_client_bytes_keyframe); - tcase_add_test (tc_chain, test_burst_client_bytes_with_keyframe); - tcase_add_test (tc_chain, test_client_next_keyframe); - - return s; -} - -GST_CHECK_MAIN (multifdsink); -- 2.7.4