mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-21 15:56:42 +00:00
Code Issues 1 Projects Releases Wiki Activity

hlsdemux: We must signal the fetcher_cond while holding its lock

Browse source
This commit is contained in:
Youness Alaoui 2011-08-26 19:09:54 +00:00 committed by Sebastian Dröge
parent 3054355dc1
commit 50d0468241
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
gst/hls/gsthlsdemux.c
View file

@ -559,8 +559,11 @@ gst_hls_demux_fetcher_sink_event (GstPad * pad, GstEvent * event)
case GST_EVENT_EOS:{ case GST_EVENT_EOS:{
GST_DEBUG_OBJECT (demux, "Got EOS on the fetcher pad"); GST_DEBUG_OBJECT (demux, "Got EOS on the fetcher pad");
/* signal we have fetched the URI */ /* signal we have fetched the URI */
if (!demux->cancelled) if (!demux->cancelled) {
g_mutex_lock (demux->fetcher_lock);
g_cond_broadcast (demux->fetcher_cond); g_cond_broadcast (demux->fetcher_cond);
g_mutex_unlock (demux->fetcher_lock);
}
} }
default: default:
break; break;
@ -784,7 +787,9 @@ gst_hls_demux_fetcher_bus_handler (GstBus * bus,
if (GST_MESSAGE_TYPE (message) == GST_MESSAGE_ERROR) { if (GST_MESSAGE_TYPE (message) == GST_MESSAGE_ERROR) {
demux->fetcher_error = TRUE; demux->fetcher_error = TRUE;
g_mutex_lock (demux->fetcher_lock);
g_cond_broadcast (demux->fetcher_cond); g_cond_broadcast (demux->fetcher_cond);
g_mutex_unlock (demux->fetcher_lock);
} }
gst_message_unref (message); gst_message_unref (message);
@ -1041,9 +1046,9 @@ state_change_error:
quit: quit:
{ {
g_mutex_unlock (demux->fetcher_lock);
/* Unlock any other fetcher that might be waiting */ /* Unlock any other fetcher that might be waiting */
g_cond_broadcast (demux->fetcher_cond); g_cond_broadcast (demux->fetcher_cond);
g_mutex_unlock (demux->fetcher_lock);
return bret; return bret;
} }
} }