mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-09-29 23:32:33 +00:00
Code Issues 1 Projects Releases Wiki Activity

streamsynchronizer: Fix another deadlock when going PAUSED->READY while streams are waiting for the GCond

Browse source
This commit is contained in:
Sebastian Dröge 2010-07-22 09:13:00 +02:00
parent b93edac480
commit ec3c19189d
2 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
gst/playback/gststreamsynchronizer.c
View file

@ -350,6 +350,12 @@ gst_stream_synchronizer_sink_event (GstPad * pad, GstEvent * event)
}
}
if (self->shutdown) {
GST_STREAM_SYNCHRONIZER_UNLOCK (self);
gst_event_unref (event);
goto done;
}
if (stream && format == GST_FORMAT_TIME) {
if (stream->new_stream) {
gint64 last_stop_running_time = 0;
@ -451,6 +457,7 @@ gst_stream_synchronizer_sink_event (GstPad * pad, GstEvent * event)
gst_object_unref (opad);
}
done:
gst_object_unref (self);
return ret;
@ -687,14 +694,23 @@ gst_stream_synchronizer_change_state (GstElement * element,
switch (transition) {
case GST_STATE_CHANGE_NULL_TO_READY:
GST_DEBUG_OBJECT (self, "State change NULL->READY");
self->shutdown = FALSE;
break;
case GST_STATE_CHANGE_READY_TO_PAUSED:
GST_DEBUG_OBJECT (self, "State change READY->PAUSED");
self->group_start_time = 0;
self->shutdown = FALSE;
break;
case GST_STATE_CHANGE_PAUSED_TO_PLAYING:
GST_DEBUG_OBJECT (self, "State change PAUSED->PLAYING");
break;
case GST_STATE_CHANGE_PAUSED_TO_READY:
GST_DEBUG_OBJECT (self, "State change READY->NULL");
GST_STREAM_SYNCHRONIZER_LOCK (self);
g_cond_broadcast (self->stream_finish_cond);
self->shutdown = TRUE;
GST_STREAM_SYNCHRONIZER_UNLOCK (self);
default:
break;
}
@ -734,7 +750,6 @@ gst_stream_synchronizer_change_state (GstElement * element,
GST_DEBUG_OBJECT (self, "State change READY->NULL");
GST_STREAM_SYNCHRONIZER_LOCK (self);
g_cond_broadcast (self->stream_finish_cond);
while (self->streams)
gst_stream_synchronizer_release_stream (self, self->streams->data);
self->current_stream_number = 0;

1
gst/playback/gststreamsynchronizer.h
View file

@ -47,6 +47,7 @@ struct _GstStreamSynchronizer
/* < private > */
GMutex *lock;
GCond *stream_finish_cond;
gboolean shutdown;
GList *streams;
guint current_stream_number;