mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-04 15:19:57 +00:00
Code Issues 1 Projects Releases Wiki Activity

adaptivedemux: reworking live manifest update wait

Browse source 
Check if the stream is live before checking if it is EOS as a live
stream might be considered EOS when it just needs to wait for a manifest
update to proceed with the next fragments
This commit is contained in:
Thiago Santos 2014-11-30 21:54:38 -03:00
parent 66202d4c1b
commit df66909129
1 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
gst-libs/gst/adaptivedemux/gstadaptivedemux.c
View file

@ -1876,25 +1876,26 @@ gst_adaptive_demux_stream_download_loop (GstAdaptiveDemuxStream * stream)
case GST_FLOW_OK:
break; /* all is good, let's go */
case GST_FLOW_EOS:
GST_DEBUG_OBJECT (stream->pad, "EOS, stopping download loop");
GST_DEBUG_OBJECT (stream->pad, "EOS, checking to stop download loop");
/* we push the EOS after releasing the object lock */
if (gst_adaptive_demux_combine_flows (demux) == GST_FLOW_EOS) {
if (gst_adaptive_demux_has_next_period (demux)) {
gst_task_pause (stream->download_task);
gst_adaptive_demux_advance_period (demux);
ret = GST_FLOW_OK;
goto end;
} else if (gst_adaptive_demux_is_live (demux)) {
if (gst_adaptive_demux_stream_wait_manifest_update (demux, stream)) {
GST_MANIFEST_UNLOCK (demux);
return;
if (gst_adaptive_demux_is_live (demux)) {
if (gst_adaptive_demux_stream_wait_manifest_update (demux, stream)) {
GST_MANIFEST_UNLOCK (demux);
return;
}
gst_task_pause (stream->download_task);
} else {
if (gst_adaptive_demux_combine_flows (demux) == GST_FLOW_EOS) {
if (gst_adaptive_demux_has_next_period (demux)) {
gst_task_pause (stream->download_task);
gst_adaptive_demux_advance_period (demux);
ret = GST_FLOW_OK;
goto end;
} else {
gst_task_pause (stream->download_task);
}
gst_task_pause (stream->download_task);
} else {
gst_task_pause (stream->download_task);
ret = GST_FLOW_OK;
}
}
break;