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

libs/gst/base/gstbasesink.c: Make sure that our internal state is correct when we commit our state asynchronously. Th...

Browse source 
Original commit message from CVS:
* libs/gst/base/gstbasesink.c: (gst_base_sink_commit_state),
(gst_base_sink_wait_preroll), (gst_base_sink_do_sync),
(gst_base_sink_preroll_object):
Make sure that our internal state is correct when we commit our state
asynchronously. This solves a race where a state change to PLAYING
could cause the sink to remain blocked in preroll in some situations.
This commit is contained in:
Wim Taymans 2006-09-15 09:49:14 +00:00
parent 0e6d20b423
commit 3db585b2d9
2 changed files with 31 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
2006-09-15 Wim Taymans <wim@fluendo.com>
* libs/gst/base/gstbasesink.c: (gst_base_sink_commit_state),
(gst_base_sink_wait_preroll), (gst_base_sink_do_sync),
(gst_base_sink_preroll_object):
Make sure that our internal state is correct when we commit our state
asynchronously. This solves a race where a state change to PLAYING
could cause the sink to remain blocked in preroll in some situations.
2006-09-15 Wim Taymans <wim@fluendo.com> 2006-09-15 Wim Taymans <wim@fluendo.com>
* tools/gst-inspect.c: (print_element_properties_info), * tools/gst-inspect.c: (print_element_properties_info),

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

@ -747,6 +747,9 @@ gst_base_sink_commit_state (GstBaseSink * basesink)
gboolean post_paused = FALSE; gboolean post_paused = FALSE;
gboolean post_playing = FALSE; gboolean post_playing = FALSE;
/* we are certainly not playing async anymore now */
basesink->playing_async = FALSE;
GST_OBJECT_LOCK (basesink); GST_OBJECT_LOCK (basesink);
current = GST_STATE (basesink); current = GST_STATE (basesink);
next = GST_STATE_NEXT (basesink); next = GST_STATE_NEXT (basesink);
@ -820,7 +823,25 @@ gst_base_sink_commit_state (GstBaseSink * basesink)
nothing_pending: nothing_pending:
{ {
GST_DEBUG_OBJECT (basesink, "nothing to commit"); /* Depending on the state, set our vars. We get in this situation when the
* state change function got a change to update the state vars before the
* streaming thread did. This is fine but we need to make sure that we
* update the need_preroll var since it was TRUE when we got here and might
* become FALSE if we got to PLAYING. */
GST_DEBUG_OBJECT (basesink, "nothing to commit, now in %s",
gst_element_state_get_name (current));
switch (current) {
case GST_STATE_PLAYING:
basesink->need_preroll = FALSE;
break;
case GST_STATE_PAUSED:
basesink->need_preroll = TRUE;
break;
default:
basesink->need_preroll = FALSE;
basesink->flushing = TRUE;
break;
}
GST_OBJECT_UNLOCK (basesink); GST_OBJECT_UNLOCK (basesink);
return TRUE; return TRUE;
} }
@ -1143,7 +1164,6 @@ again:
GST_DEBUG_OBJECT (basesink, "prerolling object %p", obj); GST_DEBUG_OBJECT (basesink, "prerolling object %p", obj);
if (G_LIKELY (basesink->playing_async)) { if (G_LIKELY (basesink->playing_async)) {
basesink->playing_async = FALSE;
/* commit state */ /* commit state */
if (G_UNLIKELY (!gst_base_sink_commit_state (basesink))) if (G_UNLIKELY (!gst_base_sink_commit_state (basesink)))
goto stopping; goto stopping;
@ -1615,7 +1635,6 @@ gst_base_sink_preroll_object (GstBaseSink * basesink, GstPad * pad,
/* commit state */ /* commit state */
if (G_LIKELY (basesink->playing_async)) { if (G_LIKELY (basesink->playing_async)) {
basesink->playing_async = FALSE;
if (G_UNLIKELY (!gst_base_sink_commit_state (basesink))) if (G_UNLIKELY (!gst_base_sink_commit_state (basesink)))
goto stopping; goto stopping;
} }