mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-18 14:26:43 +00:00
Code Issues 1 Projects Releases Wiki Activity

gstbin: unlock _get_state() on error

Browse source 
When an error message is received on the bus, mark the bin as being in the error
state and unlock all current _get_state() calls with an error.

Fixes #505770
This commit is contained in:
Wim Taymans 2010-05-25 19:17:44 +02:00
parent 4c37bae463
commit 88c6896fb9
2 changed files with 57 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
gst/gstbin.c
View file

@ -3002,6 +3002,17 @@ gst_bin_handle_message_func (GstBin * bin, GstMessage * message)
GST_MESSAGE_TYPE_NAME (message)); GST_MESSAGE_TYPE_NAME (message));
switch (type) { switch (type) {
case GST_MESSAGE_ERROR:
{
GST_OBJECT_LOCK (bin);
/* flag error */
GST_DEBUG_OBJECT (bin, "got ERROR message, unlocking state change");
GST_STATE_RETURN (bin) = GST_STATE_CHANGE_FAILURE;
GST_STATE_BROADCAST (bin);
GST_OBJECT_UNLOCK (bin);
goto forward;
}
case GST_MESSAGE_EOS: case GST_MESSAGE_EOS:
{ {
gboolean eos; gboolean eos;

46
tests/check/gst/gstbin.c
View file

@ -444,6 +444,51 @@ GST_START_TEST (test_watch_for_state_change)
GST_END_TEST; GST_END_TEST;
GST_START_TEST (test_state_change_error_message)
{
GstElement *src, *sink, *bin;
GstBus *bus;
GstStateChangeReturn ret;
bin = gst_element_factory_make ("bin", NULL);
fail_unless (bin != NULL, "Could not create bin");
bus = g_object_new (gst_bus_get_type (), NULL);
gst_element_set_bus (GST_ELEMENT_CAST (bin), bus);
src = gst_element_factory_make ("fakesrc", NULL);
fail_if (src == NULL, "Could not create fakesrc");
sink = gst_element_factory_make ("fakesink", NULL);
fail_if (sink == NULL, "Could not create fakesink");
/* add but don't link elements */
gst_bin_add (GST_BIN (bin), sink);
gst_bin_add (GST_BIN (bin), src);
/* change state, this should succeed */
ret = gst_element_set_state (GST_ELEMENT (bin), GST_STATE_PAUSED);
fail_unless (ret == GST_STATE_CHANGE_ASYNC);
/* now wait, the streaming thread will error because the source is not
* linked. */
ret = gst_element_get_state (GST_ELEMENT (bin), NULL, NULL,
GST_CLOCK_TIME_NONE);
fail_unless (ret == GST_STATE_CHANGE_FAILURE);
gst_bus_set_flushing (bus, TRUE);
/* setting bin to NULL flushes the bus automatically */
ret = gst_element_set_state (GST_ELEMENT (bin), GST_STATE_NULL);
fail_unless (ret == GST_STATE_CHANGE_SUCCESS);
/* clean up */
gst_object_unref (bus);
gst_object_unref (bin);
}
GST_END_TEST;
/* adding an element with linked pads to a bin unlinks the /* adding an element with linked pads to a bin unlinks the
* pads */ * pads */
GST_START_TEST (test_add_linked) GST_START_TEST (test_add_linked)
@ -1042,6 +1087,7 @@ gst_bin_suite (void)
tcase_add_test (tc_chain, test_message_state_changed_child); tcase_add_test (tc_chain, test_message_state_changed_child);
tcase_add_test (tc_chain, test_message_state_changed_children); tcase_add_test (tc_chain, test_message_state_changed_children);
tcase_add_test (tc_chain, test_watch_for_state_change); tcase_add_test (tc_chain, test_watch_for_state_change);
tcase_add_test (tc_chain, test_state_change_error_message);
tcase_add_test (tc_chain, test_add_linked); tcase_add_test (tc_chain, test_add_linked);
tcase_add_test (tc_chain, test_add_self); tcase_add_test (tc_chain, test_add_self);
tcase_add_test (tc_chain, test_iterate_sorted); tcase_add_test (tc_chain, test_iterate_sorted);