mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-06 02:32:23 +00:00
Code Issues 1 Projects Releases Wiki Activity

adaptivedemux: Support period change in live playlist

Browse source 
Regardless of LIVE or VOD, "a manifest has next period but
currently EOSed" state is meaning that it's time to advance period.

Previous behavior of adpativedemux, however, was able to period
advancing only for VOD case, since the adaptivedemux tried to
update and wait new manifest without respecting existence of the next period.

https://bugzilla.gnome.org/show_bug.cgi?id=781183
This commit is contained in:
Seungha Yang 2018-05-10 23:08:10 +09:00 committed by Edward Hervey
parent 67ae35813b
commit a8cb7662d7
1 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3783,8 +3783,11 @@ gst_adaptive_demux_stream_download_loop (GstAdaptiveDemuxStream * stream)
if (!demux_class->requires_periodical_playlist_update (demux)) {
ret = gst_adaptive_demux_update_manifest (demux);
break;
} else if (gst_adaptive_demux_stream_wait_manifest_update (demux,
stream)) {
/* Wait only if we can ensure current manifest has been expired.
* The meaning "we have next period" *WITH* EOS is that, current
* period has been ended but we can continue to the next period */
} else if (!gst_adaptive_demux_has_next_period (demux) &&
gst_adaptive_demux_stream_wait_manifest_update (demux, stream)) {
goto end;
}
gst_task_stop (stream->download_task);
@ -3793,13 +3796,14 @@ gst_adaptive_demux_stream_download_loop (GstAdaptiveDemuxStream * stream)
}
} else {
gst_task_stop (stream->download_task);
if (gst_adaptive_demux_combine_flows (demux) == GST_FLOW_EOS) {
if (gst_adaptive_demux_has_next_period (demux)) {
GST_DEBUG_OBJECT (stream->pad,
"Next period available, not sending EOS");
gst_adaptive_demux_advance_period (demux);
ret = GST_FLOW_OK;
}
}
if (gst_adaptive_demux_combine_flows (demux) == GST_FLOW_EOS) {
if (gst_adaptive_demux_has_next_period (demux)) {
GST_DEBUG_OBJECT (stream->pad,
"Next period available, not sending EOS");
gst_adaptive_demux_advance_period (demux);
ret = GST_FLOW_OK;
}
}
break;