mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-20 07:16:55 +00:00
Code Issues 1 Projects Releases Wiki Activity

uridecodebin: Go asynchronously from READY to PAUSED

Browse source 
We now add all our elements to uridecodebin *after*
GstBin::change_state(READY->PAUSED), so we need to post async-start
and async-done messages ourselves if we want to work async.

https://bugzilla.gnome.org/show_bug.cgi?id=733495
This commit is contained in:
Sebastian Dröge 2014-07-23 12:27:36 +02:00
parent a0dd71ad80
commit 5c038192e2
1 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
gst/playback/gsturidecodebin.c
View file

@ -991,6 +991,7 @@ done:
} else { } else {
gst_element_no_more_pads (GST_ELEMENT_CAST (decoder)); gst_element_no_more_pads (GST_ELEMENT_CAST (decoder));
} }
do_async_done (decoder);
} }
return; return;
@ -1478,6 +1479,7 @@ post_missing_plugin_error (GstElement * dec, const gchar * element_name)
GST_ELEMENT_ERROR (dec, CORE, MISSING_PLUGIN, GST_ELEMENT_ERROR (dec, CORE, MISSING_PLUGIN,
(_("Missing element '%s' - check your GStreamer installation."), (_("Missing element '%s' - check your GStreamer installation."),
element_name), (NULL)); element_name), (NULL));
do_async_done (GST_URI_DECODE_BIN (dec));
} }
/** /**
@ -1870,6 +1872,7 @@ no_decodebin:
post_missing_plugin_error (GST_ELEMENT_CAST (decoder), "decodebin"); post_missing_plugin_error (GST_ELEMENT_CAST (decoder), "decodebin");
GST_ELEMENT_ERROR (decoder, CORE, MISSING_PLUGIN, (NULL), GST_ELEMENT_ERROR (decoder, CORE, MISSING_PLUGIN, (NULL),
("No decodebin element, check your installation")); ("No decodebin element, check your installation"));
do_async_done (decoder);
return NULL; return NULL;
} }
no_typefind: no_typefind:
@ -1877,6 +1880,7 @@ no_typefind:
gst_object_unref (decodebin); gst_object_unref (decodebin);
GST_ELEMENT_ERROR (decoder, CORE, MISSING_PLUGIN, (NULL), GST_ELEMENT_ERROR (decoder, CORE, MISSING_PLUGIN, (NULL),
("No typefind element, decodebin is unusable, check your installation")); ("No typefind element, decodebin is unusable, check your installation"));
do_async_done (decoder);
return NULL; return NULL;
} }
} }
@ -1985,8 +1989,6 @@ type_found (GstElement * typefind, guint probability,
if (queue) if (queue)
gst_element_sync_state_with_parent (queue); gst_element_sync_state_with_parent (queue);
do_async_done (decoder);
return; return;
/* ERRORS */ /* ERRORS */
@ -1999,6 +2001,7 @@ could_not_link:
{ {
GST_ELEMENT_ERROR (decoder, CORE, NEGOTIATION, GST_ELEMENT_ERROR (decoder, CORE, NEGOTIATION,
(NULL), ("Can't link typefind to decodebin element")); (NULL), ("Can't link typefind to decodebin element"));
do_async_done (decoder);
return; return;
} }
no_buffer_element: no_buffer_element:
@ -2034,8 +2037,6 @@ setup_streaming (GstURIDecodeBin * decoder)
g_signal_connect (decoder->typefind, "have-type", g_signal_connect (decoder->typefind, "have-type",
G_CALLBACK (type_found), decoder); G_CALLBACK (type_found), decoder);
do_async_start (decoder);
return TRUE; return TRUE;
/* ERRORS */ /* ERRORS */
@ -2044,6 +2045,7 @@ no_typefind:
post_missing_plugin_error (GST_ELEMENT_CAST (decoder), "typefind"); post_missing_plugin_error (GST_ELEMENT_CAST (decoder), "typefind");
GST_ELEMENT_ERROR (decoder, CORE, MISSING_PLUGIN, (NULL), GST_ELEMENT_ERROR (decoder, CORE, MISSING_PLUGIN, (NULL),
("No typefind element, check your installation")); ("No typefind element, check your installation"));
do_async_done (decoder);
return FALSE; return FALSE;
} }
could_not_link: could_not_link:
@ -2053,6 +2055,7 @@ could_not_link:
gst_bin_remove (GST_BIN_CAST (decoder), typefind); gst_bin_remove (GST_BIN_CAST (decoder), typefind);
/* Don't loose the SOURCE flag */ /* Don't loose the SOURCE flag */
GST_OBJECT_FLAG_SET (decoder, GST_ELEMENT_FLAG_SOURCE); GST_OBJECT_FLAG_SET (decoder, GST_ELEMENT_FLAG_SOURCE);
do_async_done (decoder);
return FALSE; return FALSE;
} }
} }
@ -2158,6 +2161,7 @@ could_not_link:
GST_ELEMENT_ERROR (bin, CORE, NEGOTIATION, GST_ELEMENT_ERROR (bin, CORE, NEGOTIATION,
(NULL), ("Can't link source to decoder element")); (NULL), ("Can't link source to decoder element"));
GST_URI_DECODE_BIN_UNLOCK (bin); GST_URI_DECODE_BIN_UNLOCK (bin);
do_async_done (bin);
return; return;
} }
} }
@ -2230,6 +2234,7 @@ setup_source (GstURIDecodeBin * decoder)
/* source provides raw data, we added the pads and we can now signal a /* source provides raw data, we added the pads and we can now signal a
* no_more pads because we are done. */ * no_more pads because we are done. */
gst_element_no_more_pads (GST_ELEMENT_CAST (decoder)); gst_element_no_more_pads (GST_ELEMENT_CAST (decoder));
do_async_done (decoder);
return TRUE; return TRUE;
} }
if (!have_out && !is_dynamic) { if (!have_out && !is_dynamic) {
@ -2717,6 +2722,9 @@ gst_uri_decode_bin_change_state (GstElement * element,
decoder = GST_URI_DECODE_BIN (element); decoder = GST_URI_DECODE_BIN (element);
switch (transition) { switch (transition) {
case GST_STATE_CHANGE_READY_TO_PAUSED:
do_async_start (decoder);
break;
default: default:
break; break;
} }
@ -2724,6 +2732,8 @@ gst_uri_decode_bin_change_state (GstElement * element,
ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition); ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
if (ret == GST_STATE_CHANGE_FAILURE) if (ret == GST_STATE_CHANGE_FAILURE)
goto setup_failed; goto setup_failed;
else if (ret == GST_STATE_CHANGE_NO_PREROLL)
do_async_done (decoder);
switch (transition) { switch (transition) {
case GST_STATE_CHANGE_READY_TO_PAUSED: case GST_STATE_CHANGE_READY_TO_PAUSED:
@ -2731,6 +2741,8 @@ gst_uri_decode_bin_change_state (GstElement * element,
if (!setup_source (decoder)) if (!setup_source (decoder))
goto source_failed; goto source_failed;
ret = GST_STATE_CHANGE_ASYNC;
/* And now sync the states of everything we added */ /* And now sync the states of everything we added */
g_slist_foreach (decoder->decodebins, g_slist_foreach (decoder->decodebins,
(GFunc) gst_element_sync_state_with_parent, NULL); (GFunc) gst_element_sync_state_with_parent, NULL);
@ -2761,11 +2773,13 @@ gst_uri_decode_bin_change_state (GstElement * element,
/* ERRORS */ /* ERRORS */
source_failed: source_failed:
{ {
do_async_done (decoder);
return GST_STATE_CHANGE_FAILURE; return GST_STATE_CHANGE_FAILURE;
} }
setup_failed: setup_failed:
{ {
/* clean up leftover groups */ /* clean up leftover groups */
do_async_done (decoder);
return GST_STATE_CHANGE_FAILURE; return GST_STATE_CHANGE_FAILURE;
} }
} }