hls.js 1.6.0-beta.1.0.canary.10801 → 1.6.0-beta.1.0.canary.10804

package/dist/hls.mjs

@@ -400,7 +400,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.10801"}`);
+      newLogger.log(`Debug logs enabled for "${context}" in hls.js version ${"1.6.0-beta.1.0.canary.10804"}`);
     } catch (e) {
       /* log fn threw an exception. All logger methods are no-ops. */
       return createLogger();
@@ -1953,7 +1953,7 @@ class AbrController extends Logger {
         const forcedAutoLevel = this.forcedAutoLevel;
         if (i !== loadLevel && (forcedAutoLevel === -1 || forcedAutoLevel !== loadLevel)) {
           if (levelsSkipped.length) {
-            this.trace(`Skipped level(s) ${levelsSkipped.join(',')} of ${maxAutoLevel} max with CODECS and VIDEO-RANGE:"${levels[levelsSkipped[0]].codecs}" ${levels[levelsSkipped[0]].videoRange}; not compatible with "${level.codecs}" ${currentVideoRange}`);
+            this.trace(`Skipped level(s) ${levelsSkipped.join(',')} of ${maxAutoLevel} max with CODECS and VIDEO-RANGE:"${levels[levelsSkipped[0]].codecs}" ${levels[levelsSkipped[0]].videoRange}; not compatible with "${currentCodecSet}" ${currentVideoRange}`);
           }
           this.info(`switch candidate:${selectionBaseLevel}->${i} adjustedbw(${Math.round(adjustedbw)})-bitrate=${Math.round(adjustedbw - bitrate)} ttfb:${ttfbEstimateSec.toFixed(1)} avgDuration:${avgDuration.toFixed(1)} maxFetchDuration:${maxFetchDuration.toFixed(1)} fetchDuration:${fetchDuration.toFixed(1)} firstSelection:${firstSelection} codecSet:${levelInfo.codecSet} videoRange:${levelInfo.videoRange} hls.loadLevel:${loadLevel}`);
         }
@@ -6397,6 +6397,21 @@ class LevelDetails {
     }
     return -1;
   }
+  get maxPartIndex() {
+    const partList = this.partList;
+    if (partList) {
+      const lastIndex = this.lastPartIndex;
+      if (lastIndex !== -1) {
+        for (let i = partList.length; i--;) {
+          if (partList[i].index > lastIndex) {
+            return partList[i].index;
+          }
+        }
+        return lastIndex;
+      }
+    }
+    return 0;
+  }
   get lastPartSn() {
     var _this$partList3;
     if ((_this$partList3 = this.partList) != null && _this$partList3.length) {
@@ -7834,12 +7849,14 @@ function findPart(partList, sn, partIndex) {
 }
 function reassignFragmentLevelIndexes(levels) {
   levels.forEach((level, index) => {
-    const {
-      details
-    } = level;
-    if (details != null && details.fragments) {
-      details.fragments.forEach(fragment => {
+    var _level$details;
+    const fragments = (_level$details = level.details) == null ? void 0 : _level$details.fragments;
+    if (fragments) {
+      fragments.forEach(fragment => {
         fragment.level = index;
+        if (fragment.initSegment) {
+          fragment.initSegment.level = index;
+        }
       });
     }
   });
@@ -9813,7 +9830,7 @@ var eventemitter3 = {exports: {}};
 var eventemitter3Exports = eventemitter3.exports;
 var EventEmitter = /*@__PURE__*/getDefaultExportFromCjs(eventemitter3Exports);
 
-const version = "1.6.0-beta.1.0.canary.10801";
+const version = "1.6.0-beta.1.0.canary.10804";
 
 // ensure the worker ends up in the bundle
 // If the worker should not be included this gets aliased to empty.js
@@ -16882,8 +16899,8 @@ class BasePlaylistController extends Logger {
   constructor(hls, logPrefix) {
     super(logPrefix, hls.logger);
     this.hls = void 0;
-    this.timer = -1;
     this.canLoad = false;
+    this.timer = -1;
     this.hls = hls;
   }
   destroy() {
@@ -16988,11 +17005,23 @@ class BasePlaylistController extends Logger {
     if (details.live || previousDetails != null && previousDetails.live) {
       const levelOrTrack = 'levelInfo' in data ? data.levelInfo : data.track;
       details.reloaded(previousDetails);
-      this.log(`live playlist ${index} ${details.advanced ? 'REFRESHED ' + details.lastPartSn + '-' + details.lastPartIndex : details.updated ? 'UPDATED' : 'MISSED'}`);
       // Merge live playlists to adjust fragment starts and fill in delta playlist skipped segments
       if (previousDetails && details.fragments.length > 0) {
         mergeDetails(previousDetails, details);
       }
+      if (details.requestScheduled === -1) {
+        details.requestScheduled = stats.loading.start;
+      }
+      const bufferInfo = this.hls.mainForwardBufferInfo;
+      const position = bufferInfo ? bufferInfo.end - bufferInfo.len : 0;
+      const distanceToLiveEdgeMs = (details.edge - position) * 1000;
+      const reloadInterval = computeReloadInterval(details, distanceToLiveEdgeMs);
+      if (details.requestScheduled + reloadInterval < now) {
+        details.requestScheduled = now;
+      } else {
+        details.requestScheduled += reloadInterval;
+      }
+      this.log(`live playlist ${index} ${details.advanced ? 'REFRESHED ' + details.lastPartSn + '-' + details.lastPartIndex : details.updated ? 'UPDATED' : 'MISSED'}`);
       if (!this.canLoad || !details.live) {
         return;
       }
@@ -17006,12 +17035,16 @@ class BasePlaylistController extends Logger {
         const endSn = details.endSN;
         const lastPartIndex = details.lastPartIndex;
         const hasParts = lastPartIndex !== -1;
-        const lastPart = lastPartSn === endSn;
-        // When low latency mode is disabled, we'll skip part requests once the last part index is found
-        const nextSnStartIndex = lowLatencyMode ? 0 : lastPartIndex;
+        const atLastPartOfSegment = lastPartSn === endSn;
         if (hasParts) {
-          msn = lastPart ? endSn + 1 : lastPartSn;
-          part = lastPart ? nextSnStartIndex : lastPartIndex + 1;
+          // When low latency mode is disabled, request the last part of the next segment
+          if (atLastPartOfSegment) {
+            msn = endSn + 1;
+            part = lowLatencyMode ? 0 : lastPartIndex;
+          } else {
+            msn = lastPartSn;
+            part = lowLatencyMode ? lastPartIndex + 1 : details.maxPartIndex;
+          }
         } else {
           msn = endSn + 1;
         }
@@ -17043,35 +17076,24 @@ class BasePlaylistController extends Logger {
           details.tuneInGoal = currentGoal;
         }
         deliveryDirectives = this.getDeliveryDirectives(details, data.deliveryDirectives, msn, part);
-        if (lowLatencyMode || !lastPart) {
+        if (lowLatencyMode || !atLastPartOfSegment) {
+          details.requestScheduled = now;
           this.loadingPlaylist(levelOrTrack, deliveryDirectives);
           return;
         }
       } else if (details.canBlockReload || details.canSkipUntil) {
         deliveryDirectives = this.getDeliveryDirectives(details, data.deliveryDirectives, msn, part);
       }
-      if (details.requestScheduled === -1) {
-        details.requestScheduled = stats.loading.start;
-      }
       if (deliveryDirectives && msn !== undefined && details.canBlockReload) {
-        details.requestScheduled -= details.partTarget * 1000 || 1000;
-      }
-      const bufferInfo = this.hls.mainForwardBufferInfo;
-      const position = bufferInfo ? bufferInfo.end - bufferInfo.len : 0;
-      const distanceToLiveEdgeMs = (details.edge - position) * 1000;
-      const reloadInterval = computeReloadInterval(details, distanceToLiveEdgeMs);
-      if (details.requestScheduled + reloadInterval < now) {
-        details.requestScheduled = now;
-      } else {
-        details.requestScheduled += reloadInterval;
+        details.requestScheduled = stats.loading.first + Math.max(reloadInterval - elapsed * 2, reloadInterval / 2);
       }
-      this.scheduleLoading(levelOrTrack, deliveryDirectives);
+      this.scheduleLoading(levelOrTrack, deliveryDirectives, details);
     } else {
       this.clearTimer();
     }
   }
-  scheduleLoading(levelOrTrack, deliveryDirectives) {
-    const details = levelOrTrack.details;
+  scheduleLoading(levelOrTrack, deliveryDirectives, updatedDetails) {
+    const details = updatedDetails || levelOrTrack.details;
     if (!details) {
       this.loadingPlaylist(levelOrTrack, deliveryDirectives);
       return;
@@ -17084,22 +17106,7 @@ class BasePlaylistController extends Logger {
     }
     const estimatedTimeUntilUpdate = requestScheduled - now;
     this.log(`reload live playlist ${levelOrTrack.name || levelOrTrack.bitrate + 'bps'} in ${Math.round(estimatedTimeUntilUpdate)} ms`);
-    // this.log(
-    //   `live reload ${details.updated ? 'REFRESHED' : 'MISSED'}
-    // reload in ${estimatedTimeUntilUpdate / 1000}
-    // round trip ${(stats.loading.end - stats.loading.start) / 1000}
-    // diff ${
-    //   (reloadInterval -
-    //     (estimatedTimeUntilUpdate +
-    //       stats.loading.end -
-    //       stats.loading.start)) /
-    //   1000
-    // }
-    // reload interval ${reloadInterval / 1000}
-    // target duration ${details.targetduration}
-    // distance to edge ${distanceToLiveEdgeMs / 1000}`
-    // );
-
+    this.clearTimer();
     this.timer = self.setTimeout(() => this.loadingPlaylist(levelOrTrack, deliveryDirectives), estimatedTimeUntilUpdate);
   }
   getDeliveryDirectives(details, previousDeliveryDirectives, msn, part) {
@@ -17133,6 +17140,7 @@ class BasePlaylistController extends Logger {
       } else {
         const delay = getRetryDelay(retryConfig, retryCount);
         // Schedule level/track reload
+        this.clearTimer();
         this.timer = self.setTimeout(() => this.loadPlaylist(), delay);
         this.warn(`Retrying playlist loading ${retryCount + 1}/${retryConfig.maxNumRetry} after "${errorDetails}" in ${delay}ms`);
       }
@@ -24448,7 +24456,7 @@ MediaSource ${JSON.stringify(attachMediaSourceData)} from ${logFromSource}`);
         (_player$media = player.media) == null ? void 0 : _player$media.play();
       }
     } else if (scheduledItem !== null) {
-      this.resumePrimary(scheduledItem, index);
+      this.resumePrimary(scheduledItem, index, currentItem);
       if (this.shouldPlay) {
         var _this$hls$media;
         (_this$hls$media = this.hls.media) == null ? void 0 : _this$hls$media.play();
@@ -24474,12 +24482,15 @@ MediaSource ${JSON.stringify(attachMediaSourceData)} from ${logFromSource}`);
     var _this$primaryDetails;
     return !!((_this$primaryDetails = this.primaryDetails) != null && _this$primaryDetails.live);
   }
-  resumePrimary(scheduledItem, index) {
+  resumePrimary(scheduledItem, index, fromItem) {
     var _this$detachedData3;
     this.playingItem = scheduledItem;
     this.playingAsset = null;
     this.waitingItem = null;
     this.bufferedToItem(scheduledItem);
+    if (!fromItem) {
+      return;
+    }
     this.log(`resuming ${segmentToString(scheduledItem)}`);
     if (!((_this$detachedData3 = this.detachedData) != null && _this$detachedData3.mediaSource)) {
       let timelinePos = this.timelinePos;
@@ -24537,13 +24548,18 @@ MediaSource ${JSON.stringify(attachMediaSourceData)} from ${logFromSource}`);
     } else {
       this.transferMediaTo(hls, media);
       if (skipSeekToStartPosition) {
-        hls.startLoad(timelinePos, skipSeekToStartPosition);
+        this.startLoadingPrimaryAt(timelinePos, skipSeekToStartPosition);
       }
     }
     if (!skipSeekToStartPosition) {
       // Set primary position to resume time
       this.timelinePos = timelinePos;
-      hls.startLoad(timelinePos, skipSeekToStartPosition);
+      this.startLoadingPrimaryAt(timelinePos, skipSeekToStartPosition);
+    }
+  }
+  startLoadingPrimaryAt(timelinePos, skipSeekToStartPosition) {
+    if (this.hls.loadingEnabled) {
+      this.hls.startLoad(timelinePos, skipSeekToStartPosition);
     }
   }
 
@@ -24789,7 +24805,7 @@ MediaSource ${JSON.stringify(attachMediaSourceData)} from ${logFromSource}`);
   preloadPrimary(item) {
     const index = this.findItemIndex(item);
     const timelinePos = this.getPrimaryResumption(item, index);
-    this.hls.startLoad(timelinePos);
+    this.startLoadingPrimaryAt(timelinePos);
   }
   bufferedToEvent(item, assetListIndex) {
     const interstitial = item.event;
@@ -24929,7 +24945,7 @@ MediaSource ${JSON.stringify(attachMediaSourceData)} from ${logFromSource}`);
       }
     }
     const playerConfig = _objectSpread2(_objectSpread2({}, userConfig), {}, {
-      // autoStartLoad: false,
+      autoStartLoad: true,
       startFragPrefetch: true,
       primarySessionId: primary.sessionId,
       assetPlayerId: assetItem.identifier,
@@ -30413,19 +30429,6 @@ class LevelController extends BasePlaylistController {
       altAudio: !audioOnly && audioTracks.some(t => !!t.url)
     };
     this.hls.trigger(Events.MANIFEST_PARSED, edata);
-
-    // Initiate loading after all controllers have received MANIFEST_PARSED
-    const {
-      config: {
-        autoStartLoad,
-        startPosition
-      },
-      forceStartLoad
-    } = this.hls;
-    if (autoStartLoad || forceStartLoad) {
-      this.log(`${autoStartLoad ? 'auto' : 'force'} startLoad with configured startPosition ${startPosition}`);
-      this.hls.startLoad(startPosition);
-    }
   }
   get levels() {
     if (this._levels.length === 0) {
@@ -30597,8 +30600,8 @@ class LevelController extends BasePlaylistController {
       return;
     }
 
-    // only process level loaded events matching with expected level
-    if (curLevel === this.currentLevel) {
+    // only process level loaded events matching with expected level or prior to switch when media playlist is loaded directly
+    if (curLevel === this.currentLevel || data.withoutMultiVariant) {
       // reset level load error counter on successful level loaded only if there is no issues with fragments
       if (curLevel.fragmentError === 0) {
         curLevel.loadError = 0;
@@ -30653,6 +30656,9 @@ class LevelController extends BasePlaylistController {
   }
   removeLevel(levelIndex) {
     var _this$currentLevel;
+    if (this._levels.length === 1) {
+      return;
+    }
     const levels = this._levels.filter((level, index) => {
       if (index !== levelIndex) {
         return true;
@@ -30674,6 +30680,14 @@ class LevelController extends BasePlaylistController {
     if (this.currentLevelIndex > -1 && (_this$currentLevel = this.currentLevel) != null && _this$currentLevel.details) {
       this.currentLevelIndex = this.currentLevel.details.fragments[0].level;
     }
+    if (this.manualLevelIndex > -1) {
+      this.manualLevelIndex = this.currentLevelIndex;
+    }
+    const maxLevel = levels.length - 1;
+    this._firstLevel = Math.min(this._firstLevel, maxLevel);
+    if (this._startLevel) {
+      this._startLevel = Math.min(this._startLevel, maxLevel);
+    }
     this.hls.trigger(Events.LEVELS_UPDATED, {
       levels
     });
@@ -31901,6 +31915,9 @@ class StreamController extends BaseStreamController {
   onLevelsUpdated(event, data) {
     if (this.level > -1 && this.fragCurrent) {
       this.level = this.fragCurrent.level;
+      if (this.level === -1) {
+        this.resetWhenMissingContext(this.fragCurrent);
+      }
     }
     this.levels = data.levels;
   }
@@ -32806,7 +32823,7 @@ class PlaylistLoader {
       if (loaderContext && loaderContext.levelOrTrack === context.levelOrTrack && (loaderContext.url === context.url || loaderContext.deliveryDirectives && !context.deliveryDirectives)) {
         // same URL can't overlap, or wait for blocking request
         if (loaderContext.url === context.url) {
-          logger.log(`[playlist-loader]: playlist request ongoing`);
+          logger.log(`[playlist-loader]: ignore ${context.url} ongoing request`);
         } else {
           logger.log(`[playlist-loader]: ignore ${context.url} in favor of ${loaderContext.url}`);
         }
@@ -32872,7 +32889,7 @@ class PlaylistLoader {
           return;
         }
         stats.parsing.start = performance.now();
-        if (M3U8Parser.isMediaPlaylist(string)) {
+        if (M3U8Parser.isMediaPlaylist(string) || context.type !== PlaylistContextType.MANIFEST) {
           this.handleTrackOrLevelPlaylist(response, stats, context, networkDetails || null, loader);
         } else {
           this.handleMasterPlaylist(response, stats, context, networkDetails);
@@ -32890,6 +32907,22 @@ class PlaylistLoader {
 
     loader.load(context, loaderConfig, loaderCallbacks);
   }
+  checkAutostartLoad() {
+    if (!this.hls) {
+      return;
+    }
+    const {
+      config: {
+        autoStartLoad,
+        startPosition
+      },
+      forceStartLoad
+    } = this.hls;
+    if (autoStartLoad || forceStartLoad) {
+      this.hls.logger.log(`${autoStartLoad ? 'auto' : 'force'} startLoad with configured startPosition ${startPosition}`);
+      this.hls.startLoad(startPosition);
+    }
+  }
   handleMasterPlaylist(response, stats, context, networkDetails) {
     const hls = this.hls;
     const string = response.data;
@@ -32951,6 +32984,7 @@ class PlaylistLoader {
       startTimeOffset,
       variableList
     });
+    this.checkAutostartLoad();
   }
   handleTrackOrLevelPlaylist(response, stats, context, networkDetails, loader) {
     const hls = this.hls;
@@ -32996,6 +33030,9 @@ class PlaylistLoader {
     // extend the context with the new levelDetails property
     context.levelDetails = levelDetails;
     this.handlePlaylistLoaded(levelDetails, response, stats, context, networkDetails, loader);
+    if (type === PlaylistContextType.MANIFEST && (!levelDetails.playlistParsingError || !levelDetails.fragments.length && levelDetails.live)) {
+      this.checkAutostartLoad();
+    }
   }
   handleManifestParsingError(response, context, error, networkDetails, stats) {
     this.hls.trigger(Events.ERROR, {
@@ -33078,7 +33115,7 @@ class PlaylistLoader {
     const parent = mapContextToLevelType(context);
     const levelIndex = typeof context.level === 'number' && parent === PlaylistLevelType.MAIN ? level : undefined;
     if (!levelDetails.fragments.length) {
-      const _error = new Error('No Segments found in Playlist');
+      const _error = levelDetails.playlistParsingError = new Error('No Segments found in Playlist');
       hls.trigger(Events.ERROR, {
         type: ErrorTypes.NETWORK_ERROR,
         details: ErrorDetails.LEVEL_EMPTY_ERROR,
@@ -33134,7 +33171,8 @@ class PlaylistLoader {
           id: id || 0,
           stats,
           networkDetails,
-          deliveryDirectives
+          deliveryDirectives,
+          withoutMultiVariant: type === PlaylistContextType.MANIFEST
         });
         break;
       case PlaylistContextType.AUDIO_TRACK:
@@ -33260,8 +33298,9 @@ class Hls {
     this.cmcdController = void 0;
     this._media = null;
     this._url = null;
-    this.triggeringException = void 0;
     this._sessionId = void 0;
+    this.triggeringException = void 0;
+    this.started = false;
     const logger = this.logger = enableLogs(userConfig.debug || false, 'Hls instance', userConfig.assetPlayerId);
     const config = this.config = mergeConfig(Hls.DefaultConfig, userConfig, logger);
     this.userConfig = userConfig;
@@ -33516,10 +33555,14 @@ class Hls {
    */
   startLoad(startPosition = -1, skipSeekToStartPosition) {
     this.logger.log(`startLoad(${startPosition + (skipSeekToStartPosition ? ', <skip seek to start>' : '')})`);
+    this.started = true;
     this.resumeBuffering();
-    this.networkControllers.forEach(controller => {
-      controller.startLoad(startPosition, skipSeekToStartPosition);
-    });
+    for (let i = 0; i < this.networkControllers.length; i++) {
+      this.networkControllers[i].startLoad(startPosition, skipSeekToStartPosition);
+      if (!this.started || !this.networkControllers) {
+        break;
+      }
+    }
   }
 
   /**
@@ -33527,9 +33570,20 @@ class Hls {
    */
   stopLoad() {
     this.logger.log('stopLoad');
-    this.networkControllers.forEach(controller => {
-      controller.stopLoad();
-    });
+    this.started = false;
+    for (let i = 0; i < this.networkControllers.length; i++) {
+      this.networkControllers[i].stopLoad();
+      if (this.started || !this.networkControllers) {
+        break;
+      }
+    }
+  }
+
+  /**
+   * Returns whether loading, toggled with `startLoad()` and `stopLoad()`, is active or not`.
+   */
+  get loadingEnabled() {
+    return this.started;
   }
 
   /**