mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 05:16:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

basesink: also preroll after a flush with async=false

Browse source 
Make sure to preroll after a flush even when we are async=false.
Add unit test.

Fixes #634965
This commit is contained in:
Wim Taymans 2010-11-16 12:20:37 +01:00
parent 19e5a54c9f
commit 9076d5688f
2 changed files with 81 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libs/gst/base/gstbasesink.c
View file

@ -3231,7 +3231,6 @@ gst_base_sink_flush_start (GstBaseSink * basesink, GstPad * pad)
gst_element_lost_state (GST_ELEMENT_CAST (basesink)); gst_element_lost_state (GST_ELEMENT_CAST (basesink));
} else { } else {
basesink->priv->have_latency = TRUE; basesink->priv->have_latency = TRUE;
basesink->need_preroll = FALSE;
} }
gst_base_sink_set_last_buffer (basesink, NULL); gst_base_sink_set_last_buffer (basesink, NULL);
GST_PAD_STREAM_UNLOCK (pad); GST_PAD_STREAM_UNLOCK (pad);

81
tests/check/generic/sinks.c
View file

@ -1245,6 +1245,86 @@ GST_START_TEST (test_async_done_eos)
GST_END_TEST; GST_END_TEST;
static GMutex *preroll_lock;
static GCond *preroll_cond;
static void
test_async_false_seek_preroll (GstElement * elem, GstBuffer * buf,
GstPad * pad, gpointer data)
{
g_mutex_lock (preroll_lock);
GST_DEBUG ("Got preroll buffer %p", buf);
g_cond_signal (preroll_cond);
g_mutex_unlock (preroll_lock);
}
static void
test_async_false_seek_handoff (GstElement * elem, GstBuffer * buf,
GstPad * pad, gpointer data)
{
/* should never be reached, we never go to PLAYING */
GST_DEBUG ("Got handoff buffer %p", buf);
fail_unless (FALSE);
}
GST_START_TEST (test_async_false_seek)
{
GstElement *pipeline, *source, *sink;
preroll_lock = g_mutex_new ();
preroll_cond = g_cond_new ();
/* Create gstreamer elements */
pipeline = gst_pipeline_new ("test-pipeline");
source = gst_element_factory_make ("fakesrc", "file-source");
sink = gst_element_factory_make ("fakesink", "audio-output");
g_object_set (G_OBJECT (sink), "async", FALSE, NULL);
g_object_set (G_OBJECT (sink), "num-buffers", 10, NULL);
g_object_set (G_OBJECT (sink), "signal-handoffs", TRUE, NULL);
g_signal_connect (sink, "handoff", G_CALLBACK (test_async_false_seek_handoff),
NULL);
g_signal_connect (sink, "preroll-handoff",
G_CALLBACK (test_async_false_seek_preroll), NULL);
/* we add all elements into the pipeline */
gst_bin_add_many (GST_BIN (pipeline), source, sink, NULL);
/* we link the elements together */
gst_element_link (source, sink);
GST_DEBUG ("Now pausing");
g_mutex_lock (preroll_lock);
gst_element_set_state (pipeline, GST_STATE_PAUSED);
/* wait for preroll */
GST_DEBUG ("wait for preroll");
g_cond_wait (preroll_cond, preroll_lock);
g_mutex_unlock (preroll_lock);
g_mutex_lock (preroll_lock);
GST_DEBUG ("Seeking");
fail_unless (gst_element_seek (pipeline, 1.0, GST_FORMAT_BYTES,
GST_SEEK_FLAG_FLUSH, GST_SEEK_TYPE_SET, 0, GST_SEEK_TYPE_SET, -1));
GST_DEBUG ("wait for new preroll");
/* this either prerolls or fails */
g_cond_wait (preroll_cond, preroll_lock);
g_mutex_unlock (preroll_lock);
GST_DEBUG ("bring pipe to state NULL");
gst_element_set_state (pipeline, GST_STATE_NULL);
GST_DEBUG ("Deleting pipeline");
gst_object_unref (GST_OBJECT (pipeline));
g_mutex_free (preroll_lock);
g_cond_free (preroll_cond);
}
GST_END_TEST;
/* test: try changing state of sinks */ /* test: try changing state of sinks */
static Suite * static Suite *
gst_sinks_suite (void) gst_sinks_suite (void)
@ -1278,6 +1358,7 @@ gst_sinks_suite (void)
tcase_add_test (tc_chain, test_fake_eos); tcase_add_test (tc_chain, test_fake_eos);
tcase_add_test (tc_chain, test_async_done); tcase_add_test (tc_chain, test_async_done);
tcase_add_test (tc_chain, test_async_done_eos); tcase_add_test (tc_chain, test_async_done_eos);
tcase_add_test (tc_chain, test_async_false_seek);
return s; return s;
} }