mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-19 20:46:22 +00:00
Code Issues 1 Projects Releases Wiki Activity

tests: use multifdsink for streamheader test

Browse source 
Use multifdsink for pipes instead of multisocketsink,
to avoid "creating GSocket from fd 9: Socket operation
on non-socket "criticals from Gio. Test still fails,
but it fails in a different way now.
This commit is contained in:
Tim-Philipp Müller 2012-07-02 12:52:17 +01:00
parent 4b56b731d2
commit 90d86b542b
1 changed files with 10 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
tests/check/pipelines/streamheader.c
View file

@ -33,7 +33,7 @@
#ifndef GST_DISABLE_PARSE #ifndef GST_DISABLE_PARSE
/* this tests a gdp-serialized tag from audiotestsrc being sent only once /* this tests a gdp-serialized tag from audiotestsrc being sent only once
* to clients of multisocketsink */ * to clients of multifdsink */
static int n_tags = 0; static int n_tags = 0;
@ -62,19 +62,18 @@ tag_event_probe_cb (GstPad * pad, GstPadProbeInfo * info, gpointer user_data)
return GST_PAD_PROBE_OK; return GST_PAD_PROBE_OK;
} }
GST_START_TEST (test_multisocketsink_gdp_tag) GST_START_TEST (test_multifdsink_gdp_tag)
{ {
GstElement *p1, *p2; GstElement *p1, *p2;
GstElement *src, *sink, *depay; GstElement *src, *sink, *depay;
GstPad *pad; GstPad *pad;
GMainLoop *loop; GMainLoop *loop;
int pfd[2]; int pfd[2];
GSocket *s[2] = { NULL, };
loop = g_main_loop_new (NULL, FALSE); loop = g_main_loop_new (NULL, FALSE);
p1 = gst_parse_launch ("audiotestsrc num-buffers=10 ! gdppay" p1 = gst_parse_launch ("audiotestsrc num-buffers=10 ! gdppay"
" ! multisocketsink name=p1sink", NULL); " ! multifdsink name=p1sink", NULL);
fail_if (p1 == NULL); fail_if (p1 == NULL);
p2 = gst_parse_launch ("fdsrc name=p2src ! gdpdepay name=depay" p2 = gst_parse_launch ("fdsrc name=p2src ! gdpdepay name=depay"
" ! fakesink name=p2sink signal-handoffs=True", NULL); " ! fakesink name=p2sink signal-handoffs=True", NULL);
@ -82,12 +81,10 @@ GST_START_TEST (test_multisocketsink_gdp_tag)
fail_if (pipe (pfd) == -1); fail_if (pipe (pfd) == -1);
s[0] = g_socket_new_from_fd (pfd[0], NULL);
gst_element_set_state (p1, GST_STATE_READY); gst_element_set_state (p1, GST_STATE_READY);
sink = gst_bin_get_by_name (GST_BIN (p1), "p1sink"); sink = gst_bin_get_by_name (GST_BIN (p1), "p1sink");
g_signal_emit_by_name (sink, "add", s[1], NULL); g_signal_emit_by_name (sink, "add", pfd[1], NULL); ///s[1]
gst_object_unref (sink); gst_object_unref (sink);
src = gst_bin_get_by_name (GST_BIN (p2), "p2src"); src = gst_bin_get_by_name (GST_BIN (p2), "p2src");
@ -121,7 +118,7 @@ GST_END_TEST;
#ifdef HAVE_VORBIS #ifdef HAVE_VORBIS
/* this tests gdp-serialized Vorbis header pages being sent only once /* this tests gdp-serialized Vorbis header pages being sent only once
* to clients of multisocketsink; the gdp depayloader should deserialize * to clients of multifdsink; the gdp depayloader should deserialize
* exactly three in_caps buffers for the three header packets */ * exactly three in_caps buffers for the three header packets */
static int n_in_caps = 0; static int n_in_caps = 0;
@ -178,19 +175,18 @@ buffer_probe_cb (GstPad * pad, GstPadProbeInfo * info, gpointer user_data)
return TRUE; return TRUE;
} }
GST_START_TEST (test_multisocketsink_gdp_vorbisenc) GST_START_TEST (test_multifdsink_gdp_vorbisenc)
{ {
GstElement *p1, *p2; GstElement *p1, *p2;
GstElement *src, *sink, *depay; GstElement *src, *sink, *depay;
GstPad *pad; GstPad *pad;
GMainLoop *loop; GMainLoop *loop;
int pfd[2]; int pfd[2];
GSocket *s[2] = { NULL, };
loop = g_main_loop_new (NULL, FALSE); loop = g_main_loop_new (NULL, FALSE);
p1 = gst_parse_launch ("audiotestsrc num-buffers=10 ! audioconvert " p1 = gst_parse_launch ("audiotestsrc num-buffers=10 ! audioconvert "
" ! vorbisenc ! gdppay ! multisocketsink name=p1sink", NULL); " ! vorbisenc ! gdppay ! multifdsink name=p1sink", NULL);
fail_if (p1 == NULL); fail_if (p1 == NULL);
p2 = gst_parse_launch ("fdsrc name=p2src ! gdpdepay name=depay" p2 = gst_parse_launch ("fdsrc name=p2src ! gdpdepay name=depay"
" ! fakesink name=p2sink signal-handoffs=True", NULL); " ! fakesink name=p2sink signal-handoffs=True", NULL);
@ -198,12 +194,10 @@ GST_START_TEST (test_multisocketsink_gdp_vorbisenc)
fail_if (pipe (pfd) == -1); fail_if (pipe (pfd) == -1);
s[0] = g_socket_new_from_fd (pfd[0], NULL);
gst_element_set_state (p1, GST_STATE_READY); gst_element_set_state (p1, GST_STATE_READY);
sink = gst_bin_get_by_name (GST_BIN (p1), "p1sink"); sink = gst_bin_get_by_name (GST_BIN (p1), "p1sink");
g_signal_emit_by_name (sink, "add", s[1], NULL); g_signal_emit_by_name (sink, "add", pfd[1], NULL);
gst_object_unref (sink); gst_object_unref (sink);
src = gst_bin_get_by_name (GST_BIN (p2), "p2src"); src = gst_bin_get_by_name (GST_BIN (p2), "p2src");
@ -248,9 +242,9 @@ streamheader_suite (void)
suite_add_tcase (s, tc_chain); suite_add_tcase (s, tc_chain);
#ifndef GST_DISABLE_PARSE #ifndef GST_DISABLE_PARSE
tcase_add_test (tc_chain, test_multisocketsink_gdp_tag); tcase_add_test (tc_chain, test_multifdsink_gdp_tag);
#ifdef HAVE_VORBIS #ifdef HAVE_VORBIS
tcase_add_test (tc_chain, test_multisocketsink_gdp_vorbisenc); tcase_add_test (tc_chain, test_multifdsink_gdp_vorbisenc);
#endif #endif
#endif #endif