mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-03 21:12:26 +00:00
Code Issues 1 Projects Releases Wiki Activity

adaptivedemux: fix deadlock when stopping streams

Browse source 
Remember to unlock the manifest's lock when leaving the download task.
This commit is contained in:
Thiago Santos 2014-12-03 12:48:42 -03:00
parent d0892984bc
commit 87df15a214
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-libs/gst/adaptivedemux/gstadaptivedemux.c
View file

@ -1804,6 +1804,7 @@ gst_adaptive_demux_stream_download_loop (GstAdaptiveDemuxStream * stream)
GST_OBJECT_LOCK (demux); GST_OBJECT_LOCK (demux);
if (demux->cancelled) { if (demux->cancelled) {
stream->last_ret = GST_FLOW_FLUSHING; stream->last_ret = GST_FLOW_FLUSHING;
GST_MANIFEST_UNLOCK (demux);
goto cancelled; goto cancelled;
} }
GST_OBJECT_UNLOCK (demux); GST_OBJECT_UNLOCK (demux);
@ -1889,7 +1890,7 @@ gst_adaptive_demux_stream_download_loop (GstAdaptiveDemuxStream * stream)
if (gst_adaptive_demux_has_next_period (demux)) { if (gst_adaptive_demux_has_next_period (demux)) {
gst_adaptive_demux_advance_period (demux); gst_adaptive_demux_advance_period (demux);
ret = GST_FLOW_OK; ret = GST_FLOW_OK;
goto end; goto end_of_manifest;
} }
} }
} }