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

package/dist/hls.light.mjs

@@ -397,7 +397,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.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();
@@ -1078,6 +1078,7 @@ class AbrController extends Logger {
         quickly enough to prevent underbuffering
       */
     this._abandonRulesCheck = () => {
+      var _this$hls$latestLevel;
       const {
         fragCurrent: frag,
         partCurrent: part,
@@ -1132,12 +1133,15 @@ class AbrController extends Logger {
       }
       const 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
-      const fragLoadedDelay = loadRate ? (expectedLen - stats.loaded) / loadRate : expectedLen * 8 / bwEstimate + ttfbEstimate / 1000;
+      const ttfbSeconds = ttfbEstimate / 1000;
+      const 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;
       }
       const bwe = loadRate ? loadRate * 8 : bwEstimate;
+      const live = ((_this$hls$latestLevel = this.hls.latestLevelDetails) == null ? void 0 : _this$hls$latestLevel.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
@@ -1145,8 +1149,9 @@ class AbrController extends Logger {
         // compute time to load next fragment at lower level
         // 8 = bits per byte (bps/Bps)
         const levelNextBitrate = levels[nextLoadLevel].maxBitrate;
-        fragLevelNextLoadedDelay = this.getTimeToLoadFrag(ttfbEstimate / 1000, bwe, duration * levelNextBitrate, !levels[nextLoadLevel].details);
-        if (fragLevelNextLoadedDelay < bufferStarvationDelay) {
+        const requiresLevelLoad = !levels[nextLoadLevel].details || live;
+        fragLevelNextLoadedDelay = this.getTimeToLoadFrag(ttfbSeconds, bwe, duration * levelNextBitrate, requiresLevelLoad);
+        if (fragLevelNextLoadedDelay < Math.min(bufferStarvationDelay, duration + ttfbSeconds)) {
           break;
         }
       }
@@ -1160,7 +1165,6 @@ class AbrController extends Logger {
       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);
@@ -1169,11 +1173,15 @@ class AbrController extends Logger {
         this.bwEstimator.sampleTTFB(timeLoading);
       }
       const nextLoadLevelBitrate = levels[nextLoadLevel].maxBitrate;
-      if (this.getBwEstimate() * this.hls.config.abrBandWidthUpFactor > nextLoadLevelBitrate) {
+      if (this.getBwEstimate() * abrBandWidthUpFactor > nextLoadLevelBitrate) {
         this.resetEstimator(nextLoadLevelBitrate);
       }
-      this.clearTimer();
+      const 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;
+      Fragment duration: ${frag.duration.toFixed(3)}
       Time to underbuffer: ${bufferStarvationDelay.toFixed(3)} s
       Estimated load time for current fragment: ${fragLoadedDelay.toFixed(3)} s
       Estimated load time for down switch fragment: ${fragLevelNextLoadedDelay.toFixed(3)} s
@@ -1181,6 +1189,28 @@ class AbrController extends Logger {
       Current BW estimate: ${isFiniteNumber(bwEstimate) ? bwEstimate | 0 : 'Unknown'} bps
       New BW estimate: ${this.getBwEstimate() | 0} bps
       Switching to level ${nextLoadLevel} @ ${nextLoadLevelBitrate | 0} bps`);
+      hls.nextLoadLevel = hls.nextAutoLevel = nextLoadLevel;
+      this.clearTimer();
+      this.timer = self.setInterval(() => {
+        // 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) {
+          const bufferStarvationDelay = this.getStarvationDelay();
+          this.warn(`Aborting inflight request ${nextLoadLevel > 0 ? 'and switching down' : ''}
+      Fragment duration: ${frag.duration.toFixed(3)} s
+      Time to underbuffer: ${bufferStarvationDelay.toFixed(3)} s`);
+          frag.abortRequests();
+          this.fragCurrent = this.partCurrent = null;
+          if (nextLoadLevel > minAutoLevel) {
+            let 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,
         part,
@@ -1541,7 +1571,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 _level$details;
+    var _this$hls$latestLevel2;
     const maxFetchDuration = bufferStarvationDelay + maxStarvationDelay;
     const lastLoadedFragLevel = this.lastLoadedFragLevel;
     const selectionBaseLevel = lastLoadedFragLevel === -1 ? this.hls.firstLevel : lastLoadedFragLevel;
@@ -1559,7 +1589,7 @@ class AbrController extends Logger {
       return 0;
     }
     const level = levels[selectionBaseLevel];
-    const live = !!(level != null && (_level$details = level.details) != null && _level$details.live);
+    const live = !!((_this$hls$latestLevel2 = this.hls.latestLevelDetails) != null && _this$hls$latestLevel2.live);
     const firstSelection = loadLevel === -1 || lastLoadedFragLevel === -1;
     let currentCodecSet;
     let currentVideoRange = 'SDR';
@@ -18333,8 +18363,10 @@ class LevelController extends BasePlaylistController {
     const 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 : ''}`);
     const levelSwitchingData = {
@@ -18428,7 +18460,10 @@ class LevelController extends BasePlaylistController {
       return;
     }
     if (data.context.type === PlaylistContextType.LEVEL && data.context.level === this.level) {
-      this.checkRetry(data);
+      const retry = this.checkRetry(data);
+      if (!retry) {
+        this.requestScheduled = -1;
+      }
     }
   }
 
@@ -18927,7 +18962,7 @@ class GapController extends Logger {
   }
 }
 
-const version = "1.6.0-beta.1.0.canary.10714";
+const 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