mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

mssdemux: lock around 'cancelled' flag

Browse source 
Prevents race conditions when pipeline is seeking near eos
This commit is contained in:
Thiago Santos 2013-12-19 14:29:42 -03:00
parent 30c93d504c
commit aa61251371
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
ext/smoothstreaming/gstmssdemux.c
View file

@ -474,6 +474,7 @@ gst_mss_demux_stop_tasks (GstMssDemux * mssdemux, gboolean immediate)
{ {
GSList *iter; GSList *iter;
GST_OBJECT_LOCK (mssdemux);
for (iter = mssdemux->streams; iter; iter = g_slist_next (iter)) { for (iter = mssdemux->streams; iter; iter = g_slist_next (iter)) {
GstMssDemuxStream *stream = iter->data; GstMssDemuxStream *stream = iter->data;
@ -482,6 +483,7 @@ gst_mss_demux_stop_tasks (GstMssDemux * mssdemux, gboolean immediate)
if (immediate) if (immediate)
gst_uri_downloader_cancel (stream->downloader); gst_uri_downloader_cancel (stream->downloader);
} }
GST_OBJECT_UNLOCK (mssdemux);
for (iter = mssdemux->streams; iter; iter = g_slist_next (iter)) { for (iter = mssdemux->streams; iter; iter = g_slist_next (iter)) {
GstMssDemuxStream *stream = iter->data; GstMssDemuxStream *stream = iter->data;
@ -1151,11 +1153,14 @@ gst_mss_demux_download_loop (GstMssDemuxStream * stream)
ret = gst_mss_demux_stream_download_fragment (stream, &buffer); ret = gst_mss_demux_stream_download_fragment (stream, &buffer);
buffer_downloaded = buffer != NULL; buffer_downloaded = buffer != NULL;
GST_OBJECT_LOCK (mssdemux);
if (stream->cancelled) { if (stream->cancelled) {
if (buffer) if (buffer)
gst_buffer_unref (buffer); gst_buffer_unref (buffer);
GST_OBJECT_UNLOCK (mssdemux);
goto cancelled; goto cancelled;
} }
GST_OBJECT_UNLOCK (mssdemux);
if (buffer) { if (buffer) {
ret = gst_mss_demux_stream_push (stream, buffer); ret = gst_mss_demux_stream_push (stream, buffer);
@ -1163,6 +1168,12 @@ gst_mss_demux_download_loop (GstMssDemuxStream * stream)
GST_OBJECT_LOCK (mssdemux); GST_OBJECT_LOCK (mssdemux);
stream->last_ret = ret; stream->last_ret = ret;
if (stream->cancelled) {
GST_OBJECT_UNLOCK (mssdemux);
goto cancelled;
}
switch (ret) { switch (ret) {
case GST_FLOW_OK: case GST_FLOW_OK:
break; /* all is good, let's go */ break; /* all is good, let's go */
@ -1223,7 +1234,7 @@ gst_mss_demux_download_loop (GstMssDemuxStream * stream)
cancelled: cancelled:
{ {
GST_DEBUG_OBJECT (mssdemux, "Stream %p has been cancelled", stream); GST_DEBUG_OBJECT (stream->pad, "Stream has been cancelled");
return; return;
} }
} }