mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-05 06:58:56 +00:00
Code Issues 1 Projects Releases Wiki Activity

mssdemux: do not push event holding object lock

Browse source 
Can lead to deadlocks as the push might block downstream in
serialized event cases.
This commit is contained in:
Thiago Santos 2013-12-19 14:30:13 -03:00
parent aa61251371
commit ff1e88ce93
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ext/smoothstreaming/gstmssdemux.c
View file

@ -1180,7 +1180,7 @@ gst_mss_demux_download_loop (GstMssDemuxStream * stream)
case GST_FLOW_EOS: case GST_FLOW_EOS:
GST_DEBUG_OBJECT (stream->pad, "EOS, stopping download loop"); GST_DEBUG_OBJECT (stream->pad, "EOS, stopping download loop");
gst_mss_demux_stream_push_event (stream, gst_event_new_eos ()); /* we push the EOS after releasing the object lock */
gst_task_pause (stream->download_task); gst_task_pause (stream->download_task);
break; break;
@ -1224,6 +1224,10 @@ gst_mss_demux_download_loop (GstMssDemuxStream * stream)
} }
GST_OBJECT_UNLOCK (mssdemux); GST_OBJECT_UNLOCK (mssdemux);
if (G_UNLIKELY (ret == GST_FLOW_EOS)) {
gst_mss_demux_stream_push_event (stream, gst_event_new_eos ());
}
if (buffer_downloaded) { if (buffer_downloaded) {
stream->download_error_count = 0; stream->download_error_count = 0;
gst_mss_stream_advance_fragment (stream->manifest_stream); gst_mss_stream_advance_fragment (stream->manifest_stream);