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

package/dist/hls.mjs

@@ -402,7 +402,7 @@ function enableLogs(debugConfig, context, id) {
     // 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();
@@ -3226,8 +3226,8 @@ class AbrController extends Logger {
         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 = () => {
-      var _this$hls$latestLevel;
+    this._abandonRulesCheck = levelLoaded => {
+      var _ref;
       const {
         fragCurrent: frag,
         partCurrent: part,
@@ -3245,20 +3245,29 @@ class AbrController extends Logger {
       const duration = part ? part.duration : frag.duration;
       const timeLoading = now - stats.loading.start;
       const minAutoLevel = hls.minAutoLevel;
+      const loadingFragForLevel = frag.level;
+      const 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
+      const fragBlockingSwitch = currentAutoLevel > -1 && currentAutoLevel !== loadingFragForLevel;
+      const levelChange = !!levelLoaded || fragBlockingSwitch;
+      if (!levelChange && (media.paused || !media.playbackRate || !media.readyState)) {
         return;
       }
       const bufferInfo = hls.mainForwardBufferInfo;
-      if (bufferInfo === null) {
+      if (!levelChange && bufferInfo === null) {
         return;
       }
       const ttfbEstimate = this.bwEstimator.getEstimateTTFB();
@@ -3269,12 +3278,12 @@ class AbrController extends Logger {
       }
 
       // bufferStarvationDelay is an estimate of the amount time (in seconds) it will take to exhaust the buffer
-      const bufferStarvationDelay = bufferInfo.len / playbackRate;
+      const bufferStarvationDelay = bufferInfo ? bufferInfo.len / playbackRate : 0;
       const ttfb = stats.loading.first ? stats.loading.first - stats.loading.start : -1;
       const loadedFirstByte = stats.loaded && ttfb > -1;
       const bwEstimate = this.getBwEstimate();
       const levels = hls.levels;
-      const level = levels[frag.level];
+      const level = levels[loadingFragForLevel];
       const expectedLen = Math.max(stats.loaded, Math.round(duration * (frag.bitrate || level.averageBitrate) / 8));
       let timeStreaming = loadedFirstByte ? timeLoading - ttfb : timeLoading;
       if (timeStreaming < 1 && loadedFirstByte) {
@@ -3289,12 +3298,12 @@ class AbrController extends Logger {
         return;
       }
       const bwe = loadRate ? loadRate * 8 : bwEstimate;
-      const live = ((_this$hls$latestLevel = this.hls.latestLevelDetails) == null ? void 0 : _this$hls$latestLevel.live) === true;
+      const live = ((_ref = (levelLoaded == null ? void 0 : levelLoaded.details) || this.hls.latestLevelDetails) == null ? void 0 : _ref.live) === true;
       const abrBandWidthUpFactor = this.hls.config.abrBandWidthUpFactor;
       let fragLevelNextLoadedDelay = Number.POSITIVE_INFINITY;
       let 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)
         const levelNextBitrate = levels[nextLoadLevel].maxBitrate;
@@ -3329,7 +3338,7 @@ class AbrController extends Logger {
       if (bestSwitchLevel > -1) {
         nextLoadLevel = bestSwitchLevel;
       }
-      this.warn(`Fragment ${frag.sn}${part ? ' part ' + part.index : ''} of level ${frag.level} is loading too slowly;
+      this.warn(`Fragment ${frag.sn}${part ? ' part ' + part.index : ''} of level ${loadingFragForLevel} is loading too slowly;
       Fragment duration: ${frag.duration.toFixed(3)}
       Time to underbuffer: ${bufferStarvationDelay.toFixed(3)} s
       Estimated load time for current fragment: ${fragLoadedDelay.toFixed(3)} s
@@ -3340,7 +3349,7 @@ class AbrController extends Logger {
       Switching to level ${nextLoadLevel} @ ${nextLoadLevelBitrate | 0} bps`);
       hls.nextLoadLevel = hls.nextAutoLevel = nextLoadLevel;
       this.clearTimer();
-      this.timer = self.setInterval(() => {
+      const 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) {
@@ -3359,7 +3368,12 @@ class AbrController extends Logger {
             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,
         part,
@@ -3494,7 +3508,7 @@ class AbrController extends Logger {
   }
   getTimeToLoadFrag(timeToFirstByteSec, bandwidth, fragSizeBits, isSwitch) {
     const fragLoadSec = timeToFirstByteSec + fragSizeBits / bandwidth;
-    const playlistLoadSec = isSwitch ? this.lastLevelLoadSec : 0;
+    const playlistLoadSec = isSwitch ? timeToFirstByteSec + this.lastLevelLoadSec : 0;
     return fragLoadSec + playlistLoadSec;
   }
   onLevelLoaded(event, data) {
@@ -3502,7 +3516,7 @@ class AbrController extends Logger {
     const {
       loading
     } = data.stats;
-    const timeLoadingMs = loading.end - loading.start;
+    const timeLoadingMs = loading.end - loading.first;
     if (isFiniteNumber(timeLoadingMs)) {
       this.lastLevelLoadSec = timeLoadingMs / 1000;
     }
@@ -3511,6 +3525,9 @@ class AbrController extends Logger {
     } else {
       this.bwEstimator.update(config.abrEwmaSlowVoD, config.abrEwmaFastVoD);
     }
+    if (this.timer > -1) {
+      this._abandonRulesCheck(data.levelInfo);
+    }
   }
   onFragLoaded(event, {
     frag,
@@ -3720,7 +3737,7 @@ class AbrController extends Logger {
     return this.bwEstimator.canEstimate() ? this.bwEstimator.getEstimate() : this.hls.config.abrEwmaDefaultEstimate;
   }
   findBestLevel(currentBw, minAutoLevel, maxAutoLevel, bufferStarvationDelay, maxStarvationDelay, bwFactor, bwUpFactor) {
-    var _this$hls$latestLevel2;
+    var _this$hls$latestLevel;
     const maxFetchDuration = bufferStarvationDelay + maxStarvationDelay;
     const lastLoadedFragLevel = this.lastLoadedFragLevel;
     const selectionBaseLevel = lastLoadedFragLevel === -1 ? this.hls.firstLevel : lastLoadedFragLevel;
@@ -3738,7 +3755,7 @@ class AbrController extends Logger {
       return 0;
     }
     const level = levels[selectionBaseLevel];
-    const live = !!((_this$hls$latestLevel2 = this.hls.latestLevelDetails) != null && _this$hls$latestLevel2.live);
+    const live = !!((_this$hls$latestLevel = this.hls.latestLevelDetails) != null && _this$hls$latestLevel.live);
     const firstSelection = loadLevel === -1 || lastLoadedFragLevel === -1;
     let currentCodecSet;
     let currentVideoRange = 'SDR';
@@ -4919,7 +4936,6 @@ class FragmentTracker {
   }
   removeFragment(fragment) {
     const fragKey = getFragmentKey(fragment);
-    fragment.stats.loaded = 0;
     fragment.clearElementaryStreamInfo();
     const activeParts = this.activePartLists[fragment.type];
     if (activeParts) {
@@ -9048,7 +9064,7 @@ class BaseStreamController extends TaskLoop {
         const mainStart = this.hls.startPosition;
         const liveSyncPosition = this.hls.liveSyncPosition;
         const 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) {
@@ -9274,6 +9290,7 @@ class BaseStreamController extends TaskLoop {
         // 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`);
@@ -9951,7 +9968,7 @@ function requireEventemitter3 () {
 var eventemitter3Exports = requireEventemitter3();
 var EventEmitter = /*@__PURE__*/getDefaultExportFromCjs(eventemitter3Exports);
 
-const version = "1.6.0-beta.4.0.canary.11033";
+const 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
@@ -24868,8 +24885,9 @@ MediaSource ${stringify(attachMediaSourceData)} from ${logFromSource}`);
     }
   }
   startLoadingPrimaryAt(timelinePos, skipSeekToStartPosition) {
+    var _hls$mainForwardBuffe;
     const 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();
@@ -25072,11 +25090,11 @@ MediaSource ${stringify(attachMediaSourceData)} from ${logFromSource}`);
       }
       const isInterstitial = this.isInterstitial(item);
       const bufferingPlayer = this.getBufferingPlayer();
-      const 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) {
+        const 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(asset => {
@@ -32211,8 +32229,7 @@ class StreamController extends BaseStreamController {
       return;
     }
     const liveSyncPosition = this.hls.liveSyncPosition;
-    const mediaCurrentTime = media.currentTime;
-    const currentTime = this.hasEnoughToStart || mediaCurrentTime > 0 ? mediaCurrentTime : this.startPosition;
+    const currentTime = this.getLoadPosition();
     const start = levelDetails.fragmentStart;
     const end = levelDetails.edge;
     const withinSlidingWindow = currentTime >= start - config.maxFragLookUpTolerance && currentTime <= end;