FaSTTUBe/GST-Tensordecoder-ov_ep
35
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

playbin2: ensure proper PAUSED_TO_READY cleanup

Browse Source 
... since going async to PAUSED might fail, and never making it to PAUSED
subsequently skips going down to READY.

Fixes #647781.
This commit is contained in:
Mark Nauwelaerts 2011-04-14 22:13:21 +02:00
parent ef3712b427
commit 2bb91c4880
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gst/playback/gstplaybin2.c
View File

@ -3642,6 +3642,7 @@ gst_play_bin_change_state (GstElement * element, GstStateChange transition)
{ {
GstStateChangeReturn ret; GstStateChangeReturn ret;
GstPlayBin *playbin; GstPlayBin *playbin;
gboolean do_save = FALSE;
playbin = GST_PLAY_BIN (element); playbin = GST_PLAY_BIN (element);
@ -3660,6 +3661,7 @@ gst_play_bin_change_state (GstElement * element, GstStateChange transition)
} }
break; break;
case GST_STATE_CHANGE_PAUSED_TO_READY: case GST_STATE_CHANGE_PAUSED_TO_READY:
async_down:
/* FIXME unlock our waiting groups */ /* FIXME unlock our waiting groups */
GST_LOG_OBJECT (playbin, "setting shutdown flag"); GST_LOG_OBJECT (playbin, "setting shutdown flag");
g_atomic_int_set (&playbin->shutdown, 1); g_atomic_int_set (&playbin->shutdown, 1);
@ -3673,6 +3675,13 @@ gst_play_bin_change_state (GstElement * element, GstStateChange transition)
GST_PLAY_BIN_DYN_UNLOCK (playbin); GST_PLAY_BIN_DYN_UNLOCK (playbin);
break; break;
case GST_STATE_CHANGE_READY_TO_NULL: case GST_STATE_CHANGE_READY_TO_NULL:
/* we go async to PAUSED, so if that fails, we never make it to PAUSED
* an no state change PAUSED to READY passes here,
* though it is a nice-to-have ... */
if (!g_atomic_int_get (&playbin->shutdown)) {
do_save = TRUE;
goto async_down;
}
memset (&playbin->duration, 0, sizeof (playbin->duration)); memset (&playbin->duration, 0, sizeof (playbin->duration));
/* unlock so that all groups go to NULL */ /* unlock so that all groups go to NULL */
@ -3699,6 +3708,9 @@ gst_play_bin_change_state (GstElement * element, GstStateChange transition)
{ {
guint i; guint i;
/* also do missed state change down to READY */
if (do_save)
save_current_group (playbin);
/* Deactive the groups, set the uridecodebins to NULL /* Deactive the groups, set the uridecodebins to NULL
* and unref them. * and unref them.
*/ */