mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-23 16:50:47 +00:00
Code Issues 1 Projects Releases Wiki Activity

mssdemux: improve flow return handling

Browse source 
Handle different flow returns both from the streaming and the
downloading loops
This commit is contained in:
Thiago Santos 2013-12-10 18:08:40 -03:00
parent e847bea1e1
commit 056420940e
1 changed files with 28 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
ext/smoothstreaming/gstmssdemux.c
View file

@ -1295,7 +1295,7 @@ gst_mss_demux_download_loop (GstMssDemuxStream * stream)
if (G_LIKELY (ret == GST_FLOW_OK)) if (G_LIKELY (ret == GST_FLOW_OK))
stream->last_ret = GST_FLOW_CUSTOM_SUCCESS; stream->last_ret = GST_FLOW_CUSTOM_SUCCESS;
else { else {
/* TODO handle return */ stream->last_ret = ret;
} }
} else { } else {
gst_mss_demux_stream_store_object (stream, GST_MINI_OBJECT_CAST (buffer)); gst_mss_demux_stream_store_object (stream, GST_MINI_OBJECT_CAST (buffer));
@ -1311,7 +1311,11 @@ gst_mss_demux_download_loop (GstMssDemuxStream * stream)
goto error; goto error;
case GST_FLOW_NOT_LINKED: case GST_FLOW_NOT_LINKED:
goto notlinked; goto notlinked;
case GST_FLOW_FLUSHING:
goto flushing;
default: default:
if (ret < GST_FLOW_ERROR)
goto error;
break; break;
} }
@ -1360,6 +1364,23 @@ notlinked:
gst_data_queue_set_flushing (stream->dataqueue, TRUE); gst_data_queue_set_flushing (stream->dataqueue, TRUE);
} }
GST_OBJECT_UNLOCK (mssdemux); GST_OBJECT_UNLOCK (mssdemux);
return;
}
flushing:
{
GSList *iter;
GST_OBJECT_LOCK (mssdemux);
gst_task_pause (mssdemux->stream_task);
for (iter = mssdemux->streams; iter; iter = g_slist_next (iter)) {
GstMssDemuxStream *other;
other = iter->data;
gst_task_pause (other->download_task);
gst_data_queue_set_flushing (other->dataqueue, TRUE);
}
GST_OBJECT_UNLOCK (mssdemux);
return;
} }
} }
@ -1534,14 +1555,19 @@ gst_mss_demux_stream_loop (GstMssDemux * mssdemux)
ret = gst_mss_demux_combine_flows (mssdemux); ret = gst_mss_demux_combine_flows (mssdemux);
switch (ret) { switch (ret) {
case GST_FLOW_EOS: case GST_FLOW_EOS:
goto eos; /* EOS ? */ goto eos;
case GST_FLOW_ERROR: case GST_FLOW_ERROR:
goto error; goto error;
case GST_FLOW_FLUSHING:
goto stop;
case GST_FLOW_NOT_LINKED: case GST_FLOW_NOT_LINKED:
/* stream won't download any more data until it gets a reconfigure */ /* stream won't download any more data until it gets a reconfigure */
break; break;
case GST_FLOW_OK: case GST_FLOW_OK:
break;
default: default:
if (ret < GST_FLOW_ERROR)
goto error;
break; break;
} }
GST_OBJECT_UNLOCK (mssdemux); GST_OBJECT_UNLOCK (mssdemux);