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

dashdemux: add combine flows function

Browse source 
Use a flow combination function to decide the result from the
stream_loop
This commit is contained in:
Thiago Santos 2013-12-05 02:53:18 -03:00
parent 6611d14eed
commit 1483b59c6b
1 changed files with 44 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
ext/dash/gstdashdemux.c
View file

@ -1155,6 +1155,28 @@ gst_dash_demux_advance_period (GstDashDemux * demux)
return TRUE; return TRUE;
} }
static GstFlowReturn
gst_dash_demux_combine_flows (GstDashDemux * demux)
{
gboolean all_notlinked = TRUE;
GSList *iter;
for (iter = demux->streams; iter; iter = g_slist_next (iter)) {
GstDashDemuxStream *stream = iter->data;
if (stream->last_ret != GST_FLOW_NOT_LINKED)
all_notlinked = FALSE;
if (stream->last_ret <= GST_FLOW_NOT_NEGOTIATED
|| stream->last_ret == GST_FLOW_FLUSHING)
return stream->last_ret;
}
if (all_notlinked)
return GST_FLOW_NOT_LINKED;
return GST_FLOW_OK;
}
/* gst_dash_demux_stream_loop: /* gst_dash_demux_stream_loop:
* *
* Loop for the "stream' task that pushes fragments to the src pads. * Loop for the "stream' task that pushes fragments to the src pads.
@ -1326,19 +1348,28 @@ gst_dash_demux_stream_loop (GstDashDemux * demux)
gst_dash_demux_advance_period (demux); gst_dash_demux_advance_period (demux);
} }
} }
GST_DASH_DEMUX_STREAM_DOWNLOAD_LOCK (selected_stream);
if (ret != selected_stream->last_ret) { if (selected_stream) {
gst_task_start (selected_stream->download_task); GST_DASH_DEMUX_STREAM_DOWNLOAD_LOCK (selected_stream);
selected_stream->last_ret = ret; if (ret != selected_stream->last_ret) {
gst_task_start (selected_stream->download_task);
selected_stream->last_ret = ret;
}
switch (selected_stream->last_ret) {
case GST_FLOW_NOT_LINKED:
gst_data_queue_set_flushing (selected_stream->queue, TRUE);
break;
default:
break;
}
GST_DASH_DEMUX_STREAM_DOWNLOAD_UNLOCK (selected_stream);
/* combine flow returns */
ret = gst_dash_demux_combine_flows (demux);
if (ret < 0) {
goto error;
}
} }
switch (selected_stream->last_ret) {
case GST_FLOW_NOT_LINKED:
gst_data_queue_set_flushing (selected_stream->queue, TRUE);
break;
default:
break;
}
GST_DASH_DEMUX_STREAM_DOWNLOAD_UNLOCK (selected_stream);
end: end:
GST_INFO_OBJECT (demux, "Leaving streaming task"); GST_INFO_OBJECT (demux, "Leaving streaming task");
@ -1358,17 +1389,14 @@ end_of_manifest:
return; return;
} }
#if 0 error:
error_pushing:
{ {
/* FIXME: handle error */
GST_ERROR_OBJECT (demux, GST_ERROR_OBJECT (demux,
"Error pushing buffer: %s... terminating the demux", "Error pushing buffer: %s... terminating the demux",
gst_flow_get_name (ret)); gst_flow_get_name (ret));
gst_task_stop (demux->stream_task); gst_task_stop (demux->stream_task);
return; return;
} }
#endif
} }
static void static void