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

hlsdemux: Fix lots of deadlocks caused by race conditions in the task state handling

Browse source
This commit is contained in:
Sebastian Dröge 2012-10-15 09:24:01 +02:00
parent 6d0d209a28
commit ca57dd81e4
1 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
gst/hls/gsthlsdemux.c
View file

@ -126,6 +126,8 @@ gst_hls_demux_dispose (GObject * obj)
if (GST_TASK_STATE (demux->stream_task) != GST_TASK_STOPPED) { if (GST_TASK_STATE (demux->stream_task) != GST_TASK_STOPPED) {
GST_DEBUG_OBJECT (demux, "Leaving streaming task"); GST_DEBUG_OBJECT (demux, "Leaving streaming task");
gst_task_stop (demux->stream_task); gst_task_stop (demux->stream_task);
g_static_rec_mutex_lock (&demux->stream_lock);
g_static_rec_mutex_unlock (&demux->stream_lock);
gst_task_join (demux->stream_task); gst_task_join (demux->stream_task);
} }
gst_object_unref (demux->stream_task); gst_object_unref (demux->stream_task);
@ -137,6 +139,9 @@ gst_hls_demux_dispose (GObject * obj)
if (GST_TASK_STATE (demux->updates_task) != GST_TASK_STOPPED) { if (GST_TASK_STATE (demux->updates_task) != GST_TASK_STOPPED) {
GST_DEBUG_OBJECT (demux, "Leaving updates task"); GST_DEBUG_OBJECT (demux, "Leaving updates task");
gst_task_stop (demux->updates_task); gst_task_stop (demux->updates_task);
GST_TASK_SIGNAL (demux->updates_task);
g_static_rec_mutex_lock (&demux->updates_lock);
g_static_rec_mutex_unlock (&demux->updates_lock);
gst_task_join (demux->updates_task); gst_task_join (demux->updates_task);
} }
gst_object_unref (demux->updates_task); gst_object_unref (demux->updates_task);
@ -316,6 +321,9 @@ gst_hls_demux_change_state (GstElement * element, GstStateChange transition)
switch (transition) { switch (transition) {
case GST_STATE_CHANGE_PLAYING_TO_PAUSED: case GST_STATE_CHANGE_PLAYING_TO_PAUSED:
gst_task_stop (demux->updates_task); gst_task_stop (demux->updates_task);
GST_TASK_SIGNAL (demux->updates_task);
g_static_rec_mutex_lock (&demux->updates_lock);
g_static_rec_mutex_unlock (&demux->updates_lock);
break; break;
case GST_STATE_CHANGE_PAUSED_TO_READY: case GST_STATE_CHANGE_PAUSED_TO_READY:
demux->cancelled = TRUE; demux->cancelled = TRUE;
@ -397,6 +405,9 @@ gst_hls_demux_src_event (GstPad * pad, GstObject * parent, GstEvent * event)
gst_task_pause (demux->stream_task); gst_task_pause (demux->stream_task);
gst_uri_downloader_cancel (demux->downloader); gst_uri_downloader_cancel (demux->downloader);
gst_task_stop (demux->updates_task); gst_task_stop (demux->updates_task);
GST_TASK_SIGNAL (demux->updates_task);
g_static_rec_mutex_lock (&demux->updates_lock);
g_static_rec_mutex_unlock (&demux->updates_lock);
gst_task_pause (demux->stream_task); gst_task_pause (demux->stream_task);
/* wait for streaming to finish */ /* wait for streaming to finish */
@ -592,10 +603,15 @@ gst_hls_demux_stop (GstHLSDemux * demux)
demux->stop_stream_task = TRUE; demux->stop_stream_task = TRUE;
gst_task_stop (demux->updates_task); gst_task_stop (demux->updates_task);
GST_TASK_SIGNAL (demux->updates_task); GST_TASK_SIGNAL (demux->updates_task);
g_static_rec_mutex_lock (&demux->updates_lock);
g_static_rec_mutex_unlock (&demux->updates_lock);
} }
if (GST_TASK_STATE (demux->stream_task) != GST_TASK_STOPPED) if (GST_TASK_STATE (demux->stream_task) != GST_TASK_STOPPED) {
gst_task_stop (demux->stream_task); gst_task_stop (demux->stream_task);
g_static_rec_mutex_lock (&demux->stream_lock);
g_static_rec_mutex_unlock (&demux->stream_lock);
}
} }
static void static void