hls.js 1.6.0-beta.4.0.canary.11033 → 1.6.0-beta.4.0.canary.11034

package/dist/hls.js

@@ -1073,7 +1073,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.4.0.canary.11033");
+        newLogger.log("Debug logs enabled for \"" + context + "\" in hls.js version " + "1.6.0-beta.4.0.canary.11034");
       } catch (e) {
         /* log fn threw an exception. All logger methods are no-ops. */
         return createLogger();
@@ -3853,8 +3853,8 @@
           This method monitors the download rate of the current fragment, and will downswitch if that fragment will not load
           quickly enough to prevent underbuffering
         */
-      _this._abandonRulesCheck = function () {
-        var _this$hls$latestLevel;
+      _this._abandonRulesCheck = function (levelLoaded) {
+        var _ref;
         var _this2 = _this,
           frag = _this2.fragCurrent,
           part = _this2.partCurrent,
@@ -3869,20 +3869,29 @@
         var duration = part ? part.duration : frag.duration;
         var timeLoading = now - stats.loading.start;
         var minAutoLevel = hls.minAutoLevel;
+        var loadingFragForLevel = frag.level;
+        var currentAutoLevel = _this._nextAutoLevel;
         // If frag loading is aborted, complete, or from lowest level, stop timer and return
-        if (stats.aborted || stats.loaded && stats.loaded === stats.total || frag.level <= minAutoLevel) {
+        if (stats.aborted || stats.loaded && stats.loaded === stats.total || loadingFragForLevel <= minAutoLevel) {
           _this.clearTimer();
           // reset forced auto level value so that next level will be selected
           _this._nextAutoLevel = -1;
           return;
         }
 
-        // This check only runs if we're in ABR mode and actually playing
-        if (!autoLevelEnabled || media.paused || !media.playbackRate || !media.readyState) {
+        // This check only runs if we're in ABR mode
+        if (!autoLevelEnabled) {
+          return;
+        }
+
+        // Must be loading/loaded a new level or be in a playing state
+        var fragBlockingSwitch = currentAutoLevel > -1 && currentAutoLevel !== loadingFragForLevel;
+        var levelChange = !!levelLoaded || fragBlockingSwitch;
+        if (!levelChange && (media.paused || !media.playbackRate || !media.readyState)) {
           return;
         }
         var bufferInfo = hls.mainForwardBufferInfo;
-        if (bufferInfo === null) {
+        if (!levelChange && bufferInfo === null) {
           return;
         }
         var ttfbEstimate = _this.bwEstimator.getEstimateTTFB();
@@ -3893,12 +3902,12 @@
         }
 
         // bufferStarvationDelay is an estimate of the amount time (in seconds) it will take to exhaust the buffer
-        var bufferStarvationDelay = bufferInfo.len / playbackRate;
+        var bufferStarvationDelay = bufferInfo ? bufferInfo.len / playbackRate : 0;
         var ttfb = stats.loading.first ? stats.loading.first - stats.loading.start : -1;
         var loadedFirstByte = stats.loaded && ttfb > -1;
         var bwEstimate = _this.getBwEstimate();
         var levels = hls.levels;
-        var level = levels[frag.level];
+        var level = levels[loadingFragForLevel];
         var expectedLen = Math.max(stats.loaded, Math.round(duration * (frag.bitrate || level.averageBitrate) / 8));
         var timeStreaming = loadedFirstByte ? timeLoading - ttfb : timeLoading;
         if (timeStreaming < 1 && loadedFirstByte) {
@@ -3913,12 +3922,12 @@
           return;
         }
         var bwe = loadRate ? loadRate * 8 : bwEstimate;
-        var live = ((_this$hls$latestLevel = _this.hls.latestLevelDetails) == null ? void 0 : _this$hls$latestLevel.live) === true;
+        var live = ((_ref = (levelLoaded == null ? void 0 : levelLoaded.details) || _this.hls.latestLevelDetails) == null ? void 0 : _ref.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
-        for (nextLoadLevel = frag.level - 1; nextLoadLevel > minAutoLevel; nextLoadLevel--) {
+        for (nextLoadLevel = loadingFragForLevel - 1; nextLoadLevel > minAutoLevel; nextLoadLevel--) {
           // compute time to load next fragment at lower level
           // 8 = bits per byte (bps/Bps)
           var levelNextBitrate = levels[nextLoadLevel].maxBitrate;
@@ -3953,10 +3962,10 @@
         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");
+        _this.warn("Fragment " + frag.sn + (part ? ' part ' + part.index : '') + " of level " + loadingFragForLevel + " 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.timer = self.setInterval(function () {
+        var abortAndSwitch = function abortAndSwitch() {
           // 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) {
@@ -3973,7 +3982,12 @@
               _this.resetEstimator(_this.hls.levels[lowestSwitchLevel].bitrate);
             }
           }
-        }, fragLevelNextLoadedDelay * 1000);
+        };
+        if (fragBlockingSwitch || fragLoadedDelay > fragLevelNextLoadedDelay * 2) {
+          abortAndSwitch();
+        } else {
+          _this.timer = self.setInterval(abortAndSwitch, fragLevelNextLoadedDelay * 1000);
+        }
         hls.trigger(Events.FRAG_LOAD_EMERGENCY_ABORTED, {
           frag: frag,
           part: part,
@@ -4105,13 +4119,13 @@
     };
     _proto.getTimeToLoadFrag = function getTimeToLoadFrag(timeToFirstByteSec, bandwidth, fragSizeBits, isSwitch) {
       var fragLoadSec = timeToFirstByteSec + fragSizeBits / bandwidth;
-      var playlistLoadSec = isSwitch ? this.lastLevelLoadSec : 0;
+      var playlistLoadSec = isSwitch ? timeToFirstByteSec + this.lastLevelLoadSec : 0;
       return fragLoadSec + playlistLoadSec;
     };
     _proto.onLevelLoaded = function onLevelLoaded(event, data) {
       var config = this.hls.config;
       var loading = data.stats.loading;
-      var timeLoadingMs = loading.end - loading.start;
+      var timeLoadingMs = loading.end - loading.first;
       if (isFiniteNumber(timeLoadingMs)) {
         this.lastLevelLoadSec = timeLoadingMs / 1000;
       }
@@ -4120,10 +4134,13 @@
       } else {
         this.bwEstimator.update(config.abrEwmaSlowVoD, config.abrEwmaFastVoD);
       }
+      if (this.timer > -1) {
+        this._abandonRulesCheck(data.levelInfo);
+      }
     };
-    _proto.onFragLoaded = function onFragLoaded(event, _ref) {
-      var frag = _ref.frag,
-        part = _ref.part;
+    _proto.onFragLoaded = function onFragLoaded(event, _ref2) {
+      var frag = _ref2.frag,
+        part = _ref2.part;
       var stats = part ? part.stats : frag.stats;
       if (frag.type === PlaylistLevelType.MAIN) {
         this.bwEstimator.sampleTTFB(stats.loading.first - stats.loading.start);
@@ -4272,7 +4289,7 @@
       return this.bwEstimator.canEstimate() ? this.bwEstimator.getEstimate() : this.hls.config.abrEwmaDefaultEstimate;
     };
     _proto.findBestLevel = function findBestLevel(currentBw, minAutoLevel, maxAutoLevel, bufferStarvationDelay, maxStarvationDelay, bwFactor, bwUpFactor) {
-      var _this$hls$latestLevel2,
+      var _this$hls$latestLevel,
         _this3 = this;
       var maxFetchDuration = bufferStarvationDelay + maxStarvationDelay;
       var lastLoadedFragLevel = this.lastLoadedFragLevel;
@@ -4288,7 +4305,7 @@
         return 0;
       }
       var level = levels[selectionBaseLevel];
-      var live = !!((_this$hls$latestLevel2 = this.hls.latestLevelDetails) != null && _this$hls$latestLevel2.live);
+      var live = !!((_this$hls$latestLevel = this.hls.latestLevelDetails) != null && _this$hls$latestLevel.live);
       var firstSelection = loadLevel === -1 || lastLoadedFragLevel === -1;
       var currentCodecSet;
       var currentVideoRange = 'SDR';
@@ -5541,7 +5558,6 @@
     };
     _proto.removeFragment = function removeFragment(fragment) {
       var fragKey = getFragmentKey(fragment);
-      fragment.stats.loaded = 0;
       fragment.clearElementaryStreamInfo();
       var activeParts = this.activePartLists[fragment.type];
       if (activeParts) {
@@ -9791,7 +9807,7 @@
           var mainStart = this.hls.startPosition;
           var liveSyncPosition = this.hls.liveSyncPosition;
           var startPosition = frag ? (mainStart !== -1 && mainStart >= start ? mainStart : liveSyncPosition) || frag.start : pos;
-          this.log("Setting startPosition to " + startPosition + " to match initial live edge. mainStart: " + mainStart + " liveSyncPosition: " + liveSyncPosition + " frag.start: " + ((_frag = frag) == null ? void 0 : _frag.start));
+          this.log("Setting startPosition to " + startPosition + " to match start frag at live edge. mainStart: " + mainStart + " liveSyncPosition: " + liveSyncPosition + " frag.start: " + ((_frag = frag) == null ? void 0 : _frag.start));
           this.startPosition = this.nextLoadPosition = startPosition;
         }
       } else if (pos <= start) {
@@ -10007,6 +10023,7 @@
           // Leave this.startPosition at -1, so that we can use `getInitialLiveFragment` logic when startPosition has
           // not been specified via the config or an as an argument to startLoad (#3736).
           startPosition = this.hls.liveSyncPosition || sliding;
+          this.log("Setting startPosition to -1 to start at live edge " + startPosition);
           this.startPosition = -1;
         } else {
           this.log("setting startPosition to 0 by default");
@@ -16426,7 +16443,7 @@
     return !remuxResult.audio && !remuxResult.video && !remuxResult.text && !remuxResult.id3 && !remuxResult.initSegment;
   }
 
-  var version = "1.6.0-beta.4.0.canary.11033";
+  var version = "1.6.0-beta.4.0.canary.11034";
 
   // ensure the worker ends up in the bundle
   // If the worker should not be included this gets aliased to empty.js
@@ -24765,8 +24782,9 @@
       }
     };
     _proto.startLoadingPrimaryAt = function startLoadingPrimaryAt(timelinePos, skipSeekToStartPosition) {
+      var _hls$mainForwardBuffe;
       var hls = this.hls;
-      if (!hls.loadingEnabled || !hls.media || Math.abs(hls.media.currentTime - timelinePos) > 0.5) {
+      if (!hls.loadingEnabled || !hls.media || Math.abs((((_hls$mainForwardBuffe = hls.mainForwardBufferInfo) == null ? void 0 : _hls$mainForwardBuffe.start) || hls.media.currentTime) - timelinePos) > 0.5) {
         hls.startLoad(timelinePos, skipSeekToStartPosition);
       } else if (!hls.bufferingEnabled) {
         hls.resumeBuffering();
@@ -24974,11 +24992,11 @@
         }
         var isInterstitial = this.isInterstitial(item);
         var bufferingPlayer = this.getBufferingPlayer();
-        var timeRemaining = bufferingPlayer ? bufferingPlayer.remaining : bufferingLast ? bufferingLast.end - this.timelinePos : 0;
-        this.log("buffered to boundary " + segmentToString(item) + (bufferingLast ? " (" + timeRemaining.toFixed(2) + " remaining)" : ''));
         this.bufferingItem = item;
         this.bufferedPos = Math.max(item.start, Math.min(item.end, this.timelinePos));
         if (!this.playbackDisabled) {
+          var timeRemaining = bufferingPlayer ? bufferingPlayer.remaining : bufferingLast ? bufferingLast.end - this.timelinePos : 0;
+          this.log("buffered to boundary " + segmentToString(item) + (bufferingLast ? " (" + timeRemaining.toFixed(2) + " remaining)" : ''));
           if (isInterstitial) {
             // primary fragment loading will exit early in base-stream-controller while `bufferingItem` is set to an Interstitial block
             item.event.assetList.forEach(function (asset) {
@@ -33131,8 +33149,7 @@
         return;
       }
       var liveSyncPosition = this.hls.liveSyncPosition;
-      var mediaCurrentTime = media.currentTime;
-      var currentTime = this.hasEnoughToStart || mediaCurrentTime > 0 ? mediaCurrentTime : this.startPosition;
+      var currentTime = this.getLoadPosition();
       var start = levelDetails.fragmentStart;
       var end = levelDetails.edge;
       var withinSlidingWindow = currentTime >= start - config.maxFragLookUpTolerance && currentTime <= end;