mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-20 00:31:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

hlsdemux: do not allow two fetchers to run simultanously

Browse source
This commit is contained in:
Youness Alaoui 2011-08-25 23:33:10 +00:00 committed by Sebastian Dröge
parent adcfcabb14
commit e1a0bdcdf5
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
gst/hls/gsthlsdemux.c
View file

@ -555,7 +555,7 @@ gst_hls_demux_fetcher_sink_event (GstPad * pad, GstEvent * event)
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_cond_signal (demux->fetcher_cond); g_cond_broadcast (demux->fetcher_cond);
} }
default: default:
break; break;
@ -771,7 +771,7 @@ 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_cond_signal (demux->fetcher_cond); g_cond_broadcast (demux->fetcher_cond);
} }
gst_message_unref (message); gst_message_unref (message);
@ -994,6 +994,12 @@ gst_hls_demux_fetch_location (GstHLSDemux * demux, const gchar * uri)
g_mutex_lock (demux->fetcher_lock); g_mutex_lock (demux->fetcher_lock);
while (demux->fetcher)
g_cond_wait (demux->fetcher_cond, demux->fetcher_lock);
if (demux->cancelled)
goto quit;
if (!gst_hls_demux_make_fetcher (demux, uri)) { if (!gst_hls_demux_make_fetcher (demux, uri)) {
goto uri_error; goto uri_error;
} }
@ -1034,6 +1040,8 @@ state_change_error:
quit: quit:
{ {
g_mutex_unlock (demux->fetcher_lock); g_mutex_unlock (demux->fetcher_lock);
/* Unlock any other fetcher that might be waiting */
g_cond_broadcast (demux->fetcher_cond);
return bret; return bret;
} }
} }