From ff924fbdc687b224bf3744fd9ef6b5ff32eb99d1 Mon Sep 17 00:00:00 2001 From: Edward Hervey Date: Thu, 25 May 2017 09:48:53 +0200 Subject: [PATCH] adaptivedemux: Check live seeking range more often The live seeking range was only checked when doing actual seeks. This was assuming that the rate would always be 1.0 (i.e. the playback would advance in realtime, and therefore fragments would always be available since the seeking window moves at the same rate). With non-1.0 rates, this no longer becomes valid, and therefore we need to check whether we are still within the live seeking range when advancing. https://bugzilla.gnome.org/show_bug.cgi?id=783075 --- gst-libs/gst/adaptivedemux/gstadaptivedemux.c | 32 +++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/gst-libs/gst/adaptivedemux/gstadaptivedemux.c b/gst-libs/gst/adaptivedemux/gstadaptivedemux.c index b573b70..68e0d5a 100644 --- a/gst-libs/gst/adaptivedemux/gstadaptivedemux.c +++ b/gst-libs/gst/adaptivedemux/gstadaptivedemux.c @@ -1441,6 +1441,25 @@ gst_adaptive_demux_get_live_seek_range (GstAdaptiveDemux * demux, /* must be called with manifest_lock taken */ static gboolean +gst_adaptive_demux_stream_in_live_seek_range (GstAdaptiveDemux * demux, + GstAdaptiveDemuxStream * stream) +{ + gint64 range_start, range_stop; + if (gst_adaptive_demux_get_live_seek_range (demux, &range_start, &range_stop)) { + GST_LOG_OBJECT (stream->pad, + "stream position %" GST_STIME_FORMAT " live seek range %" + GST_STIME_FORMAT " - %" GST_STIME_FORMAT, + GST_STIME_ARGS (stream->segment.position), GST_STIME_ARGS (range_start), + GST_STIME_ARGS (range_stop)); + return (stream->segment.position >= range_start + && stream->segment.position <= range_stop); + } + + return FALSE; +} + +/* must be called with manifest_lock taken */ +static gboolean gst_adaptive_demux_can_seek (GstAdaptiveDemux * demux) { GstAdaptiveDemuxClass *klass; @@ -3567,7 +3586,8 @@ gst_adaptive_demux_stream_download_loop (GstAdaptiveDemuxStream * stream) case GST_FLOW_EOS: GST_DEBUG_OBJECT (stream->pad, "EOS, checking to stop download loop"); /* we push the EOS after releasing the object lock */ - if (gst_adaptive_demux_is_live (demux)) { + if (gst_adaptive_demux_is_live (demux) + && gst_adaptive_demux_stream_in_live_seek_range (demux, stream)) { GstAdaptiveDemuxClass *demux_class = GST_ADAPTIVE_DEMUX_GET_CLASS (demux); @@ -3974,7 +3994,15 @@ gst_adaptive_demux_stream_advance_fragment_unlocked (GstAdaptiveDemux * demux, } GST_ADAPTIVE_DEMUX_SEGMENT_UNLOCK (demux); - if (gst_adaptive_demux_is_live (demux) + /* When advancing with a non 1.0 rate on live streams, we need to check + * the live seeking range again to make sure we can still advance to + * that position */ + if (demux->segment.rate != 1.0 && gst_adaptive_demux_is_live (demux)) { + if (!gst_adaptive_demux_stream_in_live_seek_range (demux, stream)) + ret = GST_FLOW_EOS; + else + ret = klass->stream_advance_fragment (stream); + } else if (gst_adaptive_demux_is_live (demux) || gst_adaptive_demux_stream_has_next_fragment (demux, stream)) { ret = klass->stream_advance_fragment (stream); } else { -- 2.7.4