mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-25 01:30:38 +00:00
Code Issues 1 Projects Releases Wiki Activity

hlsdemux: Only lock the mutex when it's not locked already

Browse source 
Conflicts:
	gst/hls/gsthlsdemux.c
This commit is contained in:
Sebastian Dröge 2012-10-15 10:38:16 +02:00
parent 443703a08e
commit b335f5a68e
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
gst/hls/gsthlsdemux.c
View file

@ -102,7 +102,7 @@ static gboolean gst_hls_demux_src_query (GstPad * pad, GstObject * parent,
static void gst_hls_demux_stream_loop (GstHLSDemux * demux); static void gst_hls_demux_stream_loop (GstHLSDemux * demux);
static void gst_hls_demux_updates_loop (GstHLSDemux * demux); static void gst_hls_demux_updates_loop (GstHLSDemux * demux);
static void gst_hls_demux_stop (GstHLSDemux * demux); static void gst_hls_demux_stop (GstHLSDemux * demux);
static void gst_hls_demux_pause_tasks (GstHLSDemux * demux); static void gst_hls_demux_pause_tasks (GstHLSDemux * demux, gboolean caching);
static gboolean gst_hls_demux_cache_fragments (GstHLSDemux * demux); static gboolean gst_hls_demux_cache_fragments (GstHLSDemux * demux);
static gboolean gst_hls_demux_schedule (GstHLSDemux * demux); static gboolean gst_hls_demux_schedule (GstHLSDemux * demux);
static gboolean gst_hls_demux_switch_playlist (GstHLSDemux * demux); static gboolean gst_hls_demux_switch_playlist (GstHLSDemux * demux);
@ -602,16 +602,18 @@ gst_hls_demux_chain (GstPad * pad, GstObject * parent, GstBuffer * buf)
} }
static void static void
gst_hls_demux_pause_tasks (GstHLSDemux * demux) gst_hls_demux_pause_tasks (GstHLSDemux * demux, gboolean caching)
{ {
gst_uri_downloader_cancel (demux->downloader); gst_uri_downloader_cancel (demux->downloader);
if (GST_TASK_STATE (demux->updates_task) != GST_TASK_STOPPED) { if (GST_TASK_STATE (demux->updates_task) != GST_TASK_STOPPED) {
demux->stop_stream_task = TRUE; demux->stop_stream_task = TRUE;
gst_task_pause (demux->updates_task); gst_task_pause (demux->updates_task);
g_mutex_lock (&demux->updates_timed_lock); if (!caching)
g_mutex_lock (&demux->updates_timed_lock);
GST_TASK_SIGNAL (demux->updates_task); GST_TASK_SIGNAL (demux->updates_task);
g_mutex_unlock (&demux->updates_timed_lock); if (!caching)
g_mutex_unlock (&demux->updates_timed_lock);
} }
if (GST_TASK_STATE (demux->stream_task) != GST_TASK_STOPPED) { if (GST_TASK_STATE (demux->stream_task) != GST_TASK_STOPPED) {
@ -752,7 +754,7 @@ end_of_playlist:
{ {
GST_DEBUG_OBJECT (demux, "Reached end of playlist, sending EOS"); GST_DEBUG_OBJECT (demux, "Reached end of playlist, sending EOS");
gst_pad_push_event (demux->srcpad, gst_event_new_eos ()); gst_pad_push_event (demux->srcpad, gst_event_new_eos ());
gst_hls_demux_pause_tasks (demux); gst_hls_demux_pause_tasks (demux, FALSE);
return; return;
} }
@ -762,7 +764,7 @@ cache_error:
if (!demux->cancelled) { if (!demux->cancelled) {
GST_ELEMENT_ERROR (demux, RESOURCE, NOT_FOUND, GST_ELEMENT_ERROR (demux, RESOURCE, NOT_FOUND,
("Could not cache the first fragments"), (NULL)); ("Could not cache the first fragments"), (NULL));
gst_hls_demux_pause_tasks (demux); gst_hls_demux_pause_tasks (demux, FALSE);
} }
return; return;
} }
@ -777,7 +779,7 @@ error_pushing:
GST_DEBUG_OBJECT (demux, "stream stopped, reason %s", GST_DEBUG_OBJECT (demux, "stream stopped, reason %s",
gst_flow_get_name (ret)); gst_flow_get_name (ret));
} }
gst_hls_demux_pause_tasks (demux); gst_hls_demux_pause_tasks (demux, FALSE);
return; return;
} }
@ -915,7 +917,7 @@ quit:
error: error:
{ {
GST_DEBUG_OBJECT (demux, "Stopped updates task because of error"); GST_DEBUG_OBJECT (demux, "Stopped updates task because of error");
gst_hls_demux_pause_tasks (demux); gst_hls_demux_pause_tasks (demux, TRUE);
g_mutex_unlock (&demux->updates_timed_lock); g_mutex_unlock (&demux->updates_timed_lock);
} }
} }