From: Edward Hervey <edward@centricular.com>
Date: Thu, 25 May 2017 07:48:53 +0000 (+0200)
Subject: adaptivedemux: Check live seeking range more often
X-Git-Tag: 1.19.3~507^2~5170
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f4190a49c04f1d5d174cebba0bc9a03a7ec721c2;p=platform%2Fupstream%2Fgstreamer.git

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
---

diff --git a/gst-libs/gst/adaptivedemux/gstadaptivedemux.c b/gst-libs/gst/adaptivedemux/gstadaptivedemux.c
index 21ba1fc..821b182 100644
--- a/gst-libs/gst/adaptivedemux/gstadaptivedemux.c
+++ b/gst-libs/gst/adaptivedemux/gstadaptivedemux.c
@@ -1448,6 +1448,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;
@@ -3703,7 +3722,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);
 
@@ -4120,7 +4140,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 {