mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-31 03:29:50 +00:00
Code Issues 1 Projects Releases Wiki Activity

hlsdemux: Do not join the task from the task's thread itself. join it only in the state change

Browse source
This commit is contained in:
Youness Alaoui 2011-09-07 20:09:12 +00:00 committed by Alessandro Decina
parent dbcec90989
commit baf875b928
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
gst/hls/gsthlsdemux.c
View file

@ -310,6 +310,7 @@ gst_hls_demux_change_state (GstElement * element, GstStateChange transition)
case GST_STATE_CHANGE_PAUSED_TO_READY: case GST_STATE_CHANGE_PAUSED_TO_READY:
demux->cancelled = TRUE; demux->cancelled = TRUE;
gst_hls_demux_stop (demux); gst_hls_demux_stop (demux);
gst_task_join (demux->task);
gst_hls_demux_reset (demux, FALSE); gst_hls_demux_reset (demux, FALSE);
break; break;
default: default:
@ -665,7 +666,7 @@ gst_hls_demux_stop (GstHLSDemux * demux)
g_mutex_lock (demux->fetcher_lock); g_mutex_lock (demux->fetcher_lock);
gst_hls_demux_stop_fetcher_locked (demux, TRUE); gst_hls_demux_stop_fetcher_locked (demux, TRUE);
g_mutex_unlock (demux->fetcher_lock); g_mutex_unlock (demux->fetcher_lock);
gst_task_join (demux->task); gst_task_stop (demux->task);
gst_hls_demux_stop_update (demux); gst_hls_demux_stop_update (demux);
} }