hls.js 1.6.0-beta.1.0.canary.10714 → 1.6.0-beta.1.0.canary.10717

package/dist/hls.js

@@ -1054,7 +1054,7 @@
       // Some browsers don't allow to use bind on console object anyway
       // fallback to default if needed
       try {
-        newLogger.log("Debug logs enabled for \"" + context + "\" in hls.js version " + "1.6.0-beta.1.0.canary.10714");
+        newLogger.log("Debug logs enabled for \"" + context + "\" in hls.js version " + "1.6.0-beta.1.0.canary.10717");
       } catch (e) {
         /* log fn threw an exception. All logger methods are no-ops. */
         return createLogger();
@@ -2067,6 +2067,7 @@
           quickly enough to prevent underbuffering
         */
       _this._abandonRulesCheck = function () {
+        var _this$hls$latestLevel;
         var _this2 = _this,
           frag = _this2.fragCurrent,
           part = _this2.partCurrent,
@@ -2118,12 +2119,15 @@
         }
         var loadRate = loadedFirstByte ? stats.loaded * 1000 / timeStreaming : 0;
         // fragLoadDelay is an estimate of the time (in seconds) it will take to buffer the remainder of the fragment
-        var fragLoadedDelay = loadRate ? (expectedLen - stats.loaded) / loadRate : expectedLen * 8 / bwEstimate + ttfbEstimate / 1000;
+        var ttfbSeconds = ttfbEstimate / 1000;
+        var fragLoadedDelay = loadRate ? (expectedLen - stats.loaded) / loadRate : expectedLen * 8 / bwEstimate + ttfbSeconds;
         // Only downswitch if the time to finish loading the current fragment is greater than the amount of buffer left
         if (fragLoadedDelay <= bufferStarvationDelay) {
           return;
         }
         var bwe = loadRate ? loadRate * 8 : bwEstimate;
+        var live = ((_this$hls$latestLevel = _this.hls.latestLevelDetails) == null ? void 0 : _this$hls$latestLevel.live) === true;
+        var abrBandWidthUpFactor = _this.hls.config.abrBandWidthUpFactor;
         var fragLevelNextLoadedDelay = Number.POSITIVE_INFINITY;
         var nextLoadLevel;
         // Iterate through lower level and try to find the largest one that avoids rebuffering
@@ -2131,8 +2135,9 @@
           // compute time to load next fragment at lower level
           // 8 = bits per byte (bps/Bps)
           var levelNextBitrate = levels[nextLoadLevel].maxBitrate;
-          fragLevelNextLoadedDelay = _this.getTimeToLoadFrag(ttfbEstimate / 1000, bwe, duration * levelNextBitrate, !levels[nextLoadLevel].details);
-          if (fragLevelNextLoadedDelay < bufferStarvationDelay) {
+          var requiresLevelLoad = !levels[nextLoadLevel].details || live;
+          fragLevelNextLoadedDelay = _this.getTimeToLoadFrag(ttfbSeconds, bwe, duration * levelNextBitrate, requiresLevelLoad);
+          if (fragLevelNextLoadedDelay < Math.min(bufferStarvationDelay, duration + ttfbSeconds)) {
             break;
           }
         }
@@ -2146,7 +2151,6 @@
         if (fragLevelNextLoadedDelay > duration * 10) {
           return;
         }
-        hls.nextLoadLevel = hls.nextAutoLevel = nextLoadLevel;
         if (loadedFirstByte) {
           // If there has been loading progress, sample bandwidth using loading time offset by minimum TTFB time
           _this.bwEstimator.sample(timeLoading - Math.min(ttfbEstimate, ttfb), stats.loaded);
@@ -2155,11 +2159,34 @@
           _this.bwEstimator.sampleTTFB(timeLoading);
         }
         var nextLoadLevelBitrate = levels[nextLoadLevel].maxBitrate;
-        if (_this.getBwEstimate() * _this.hls.config.abrBandWidthUpFactor > nextLoadLevelBitrate) {
+        if (_this.getBwEstimate() * abrBandWidthUpFactor > nextLoadLevelBitrate) {
           _this.resetEstimator(nextLoadLevelBitrate);
         }
+        var bestSwitchLevel = _this.findBestLevel(nextLoadLevelBitrate, minAutoLevel, nextLoadLevel, 0, bufferStarvationDelay, 1, 1);
+        if (bestSwitchLevel > -1) {
+          nextLoadLevel = bestSwitchLevel;
+        }
+        _this.warn("Fragment " + frag.sn + (part ? ' part ' + part.index : '') + " of level " + frag.level + " is loading too slowly;\n      Fragment duration: " + frag.duration.toFixed(3) + "\n      Time to underbuffer: " + bufferStarvationDelay.toFixed(3) + " s\n      Estimated load time for current fragment: " + fragLoadedDelay.toFixed(3) + " s\n      Estimated load time for down switch fragment: " + fragLevelNextLoadedDelay.toFixed(3) + " s\n      TTFB estimate: " + (ttfb | 0) + " ms\n      Current BW estimate: " + (isFiniteNumber(bwEstimate) ? bwEstimate | 0 : 'Unknown') + " bps\n      New BW estimate: " + (_this.getBwEstimate() | 0) + " bps\n      Switching to level " + nextLoadLevel + " @ " + (nextLoadLevelBitrate | 0) + " bps");
+        hls.nextLoadLevel = hls.nextAutoLevel = nextLoadLevel;
         _this.clearTimer();
-        _this.warn("Fragment " + frag.sn + (part ? ' part ' + part.index : '') + " of level " + frag.level + " is loading too slowly;\n      Time to underbuffer: " + bufferStarvationDelay.toFixed(3) + " s\n      Estimated load time for current fragment: " + fragLoadedDelay.toFixed(3) + " s\n      Estimated load time for down switch fragment: " + fragLevelNextLoadedDelay.toFixed(3) + " s\n      TTFB estimate: " + (ttfb | 0) + " ms\n      Current BW estimate: " + (isFiniteNumber(bwEstimate) ? bwEstimate | 0 : 'Unknown') + " bps\n      New BW estimate: " + (_this.getBwEstimate() | 0) + " bps\n      Switching to level " + nextLoadLevel + " @ " + (nextLoadLevelBitrate | 0) + " bps");
+        _this.timer = self.setInterval(function () {
+          // Are nextLoadLevel details available or is stream-controller still in "WAITING_LEVEL" state?
+          _this.clearTimer();
+          if (_this.fragCurrent === frag && _this.hls.loadLevel === nextLoadLevel && nextLoadLevel > 0) {
+            var _bufferStarvationDelay = _this.getStarvationDelay();
+            _this.warn("Aborting inflight request " + (nextLoadLevel > 0 ? 'and switching down' : '') + "\n      Fragment duration: " + frag.duration.toFixed(3) + " s\n      Time to underbuffer: " + _bufferStarvationDelay.toFixed(3) + " s");
+            frag.abortRequests();
+            _this.fragCurrent = _this.partCurrent = null;
+            if (nextLoadLevel > minAutoLevel) {
+              var lowestSwitchLevel = _this.findBestLevel(_this.hls.levels[minAutoLevel].bitrate, minAutoLevel, nextLoadLevel, 0, _bufferStarvationDelay, 1, 1);
+              if (lowestSwitchLevel === -1) {
+                lowestSwitchLevel = minAutoLevel;
+              }
+              _this.hls.nextLoadLevel = _this.hls.nextAutoLevel = lowestSwitchLevel;
+              _this.resetEstimator(_this.hls.levels[lowestSwitchLevel].bitrate);
+            }
+          }
+        }, fragLevelNextLoadedDelay * 1000);
         hls.trigger(Events.FRAG_LOAD_EMERGENCY_ABORTED, {
           frag: frag,
           part: part,
@@ -2458,7 +2485,7 @@
       return this.bwEstimator.canEstimate() ? this.bwEstimator.getEstimate() : this.hls.config.abrEwmaDefaultEstimate;
     };
     _proto.findBestLevel = function findBestLevel(currentBw, minAutoLevel, maxAutoLevel, bufferStarvationDelay, maxStarvationDelay, bwFactor, bwUpFactor) {
-      var _level$details,
+      var _this$hls$latestLevel2,
         _this3 = this;
       var maxFetchDuration = bufferStarvationDelay + maxStarvationDelay;
       var lastLoadedFragLevel = this.lastLoadedFragLevel;
@@ -2474,7 +2501,7 @@
         return 0;
       }
       var level = levels[selectionBaseLevel];
-      var live = !!(level != null && (_level$details = level.details) != null && _level$details.live);
+      var live = !!((_this$hls$latestLevel2 = this.hls.latestLevelDetails) != null && _this$hls$latestLevel2.live);
       var firstSelection = loadLevel === -1 || lastLoadedFragLevel === -1;
       var currentCodecSet;
       var currentVideoRange = 'SDR';
@@ -16059,7 +16086,7 @@
     return !remuxResult.audio && !remuxResult.video && !remuxResult.text && !remuxResult.id3 && !remuxResult.initSegment;
   }
 
-  var version = "1.6.0-beta.1.0.canary.10714";
+  var version = "1.6.0-beta.1.0.canary.10717";
 
   // ensure the worker ends up in the bundle
   // If the worker should not be included this gets aliased to empty.js
@@ -31012,7 +31039,10 @@
         return;
       }
       if (data.context.type === PlaylistContextType.LEVEL && data.context.level === this.level) {
-        this.checkRetry(data);
+        var retry = this.checkRetry(data);
+        if (!retry) {
+          this.requestScheduled = -1;
+        }
       }
     }
 
@@ -31187,8 +31217,10 @@
         var pathwayId = level.attrs['PATHWAY-ID'];
         this.currentLevelIndex = newLevel;
         this.currentLevel = level;
-        if (lastLevelIndex === newLevel && level.details && lastLevel && lastPathwayId === pathwayId) {
-          return;
+        if (lastLevelIndex === newLevel && lastLevel && lastPathwayId === pathwayId) {
+          if (level.details || this.requestScheduled !== -1) {
+            return;
+          }
         }
         this.log("Switching to level " + newLevel + " (" + (level.height ? level.height + 'p ' : '') + (level.videoRange ? level.videoRange + ' ' : '') + (level.codecSet ? level.codecSet + ' ' : '') + "@" + level.bitrate + ")" + (pathwayId ? ' with Pathway ' + pathwayId : '') + " from level " + lastLevelIndex + (lastPathwayId ? ' with Pathway ' + lastPathwayId : ''));
         var levelSwitchingData = {