hls.js 1.6.0-beta.1.0.canary.10764 → 1.6.0-beta.1.0.canary.10765

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.10764"}`);
+      newLogger.log(`Debug logs enabled for "${context}" in hls.js version ${"1.6.0-beta.1.0.canary.10765"}`);
     } catch (e) {
       /* log fn threw an exception. All logger methods are no-ops. */
       return createLogger();
@@ -1884,8 +1884,10 @@ class AbrController extends Logger {
         continue;
       }
       if (config.useMediaCapabilities && !levelInfo.supportedResult && !levelInfo.supportedPromise) {
+        var _levelInfo$videoCodec;
         const mediaCapabilities = navigator.mediaCapabilities;
-        if (typeof (mediaCapabilities == null ? void 0 : mediaCapabilities.decodingInfo) === 'function' && requiresMediaCapabilitiesDecodingInfo(levelInfo, audioTracksByGroup, currentVideoRange, currentFrameRate, currentBw, audioPreference)) {
+        if (typeof (mediaCapabilities == null ? void 0 : mediaCapabilities.decodingInfo) === 'function' && (requiresMediaCapabilitiesDecodingInfo(levelInfo, audioTracksByGroup, currentVideoRange, currentFrameRate, currentBw, audioPreference) || ((_levelInfo$videoCodec = levelInfo.videoCodec) == null ? void 0 : _levelInfo$videoCodec.substring(0, 4)) === 'hvc1') // Force media capabilities check for HEVC to avoid failure on Windows
+        ) {
           levelInfo.supportedPromise = getMediaDecodingInfoPromise(levelInfo, audioTracksByGroup, mediaCapabilities);
           levelInfo.supportedPromise.then(decodingInfo => {
             if (!this.hls) {
@@ -1901,6 +1903,9 @@ class AbrController extends Logger {
               if (index > -1 && levels.length > 1) {
                 this.log(`Removing unsupported level ${index}`);
                 this.hls.removeLevel(index);
+                if (this.hls.loadLevel === -1) {
+                  this.hls.nextLoadLevel = 0;
+                }
               }
             }
           });
@@ -9769,7 +9774,7 @@ var eventemitter3 = {exports: {}};
 var eventemitter3Exports = eventemitter3.exports;
 var EventEmitter = /*@__PURE__*/getDefaultExportFromCjs(eventemitter3Exports);
 
-const version = "1.6.0-beta.1.0.canary.10764";
+const version = "1.6.0-beta.1.0.canary.10765";
 
 // ensure the worker ends up in the bundle
 // If the worker should not be included this gets aliased to empty.js
@@ -17379,7 +17384,8 @@ class AudioTrackController extends BasePlaylistController {
         url,
         id,
         groupId,
-        deliveryDirectives: hlsUrlParameters || null
+        deliveryDirectives: hlsUrlParameters || null,
+        track: audioTrack
       });
     }
   }
@@ -22420,7 +22426,8 @@ class SubtitleTrackController extends BasePlaylistController {
         url,
         id,
         groupId,
-        deliveryDirectives: hlsUrlParameters || null
+        deliveryDirectives: hlsUrlParameters || null,
+        track: currentTrack
       });
     }
   }
@@ -30495,7 +30502,7 @@ class LevelController extends BasePlaylistController {
       level,
       details
     } = data;
-    const curLevel = this._levels[level];
+    const curLevel = data.levelInfo;
     if (!curLevel) {
       var _data$deliveryDirecti;
       this.warn(`Invalid level index ${level}`);
@@ -30506,7 +30513,7 @@ class LevelController extends BasePlaylistController {
     }
 
     // only process level loaded events matching with expected level
-    if (level === this.currentLevelIndex) {
+    if (curLevel === this.currentLevel) {
       // reset level load error counter on successful level loaded only if there is no issues with fragments
       if (curLevel.fragmentError === 0) {
         curLevel.loadError = 0;
@@ -30544,6 +30551,7 @@ class LevelController extends BasePlaylistController {
       this.hls.trigger(Events.LEVEL_LOADING, {
         url,
         level: currentLevelIndex,
+        levelInfo: currentLevel,
         pathwayId: currentLevel.attrs['PATHWAY-ID'],
         id: 0,
         // Deprecated Level urlId
@@ -31477,7 +31485,7 @@ class StreamController extends BaseStreamController {
     if (!levels || this.state !== State.IDLE) {
       return;
     }
-    const level = levels[data.level];
+    const level = data.levelInfo;
     if (!level.details || level.details.live && this.levelLastLoaded !== level || this.waitForCdnTuneIn(level.details)) {
       this.state = State.WAITING_LEVEL;
     }
@@ -31496,7 +31504,7 @@ class StreamController extends BaseStreamController {
       return;
     }
     this.log(`Level ${newLevelId} loaded [${newDetails.startSN},${newDetails.endSN}]${newDetails.lastPartSn ? `[part-${newDetails.lastPartSn}-${newDetails.lastPartIndex}]` : ''}, cc [${newDetails.startCC}, ${newDetails.endCC}] duration:${duration}`);
-    const curLevel = levels[newLevelId];
+    const curLevel = data.levelInfo;
     const fragCurrent = this.fragCurrent;
     if (fragCurrent && (this.state === State.FRAG_LOADING || this.state === State.FRAG_LOADING_WAITING_RETRY)) {
       if (fragCurrent.level !== data.level && fragCurrent.loader) {
@@ -32569,6 +32577,7 @@ class PlaylistLoader {
     hls.on(Events.LEVEL_LOADING, this.onLevelLoading, this);
     hls.on(Events.AUDIO_TRACK_LOADING, this.onAudioTrackLoading, this);
     hls.on(Events.SUBTITLE_TRACK_LOADING, this.onSubtitleTrackLoading, this);
+    hls.on(Events.LEVELS_UPDATED, this.onLevelsUpdated, this);
   }
   unregisterListeners() {
     const {
@@ -32578,6 +32587,7 @@ class PlaylistLoader {
     hls.off(Events.LEVEL_LOADING, this.onLevelLoading, this);
     hls.off(Events.AUDIO_TRACK_LOADING, this.onAudioTrackLoading, this);
     hls.off(Events.SUBTITLE_TRACK_LOADING, this.onSubtitleTrackLoading, this);
+    hls.off(Events.LEVELS_UPDATED, this.onLevelsUpdated, this);
   }
 
   /**
@@ -32629,7 +32639,8 @@ class PlaylistLoader {
       responseType: 'text',
       type: PlaylistContextType.MANIFEST,
       url,
-      deliveryDirectives: null
+      deliveryDirectives: null,
+      levelOrTrack: null
     });
   }
   onLevelLoading(event, data) {
@@ -32638,7 +32649,8 @@ class PlaylistLoader {
       level,
       pathwayId,
       url,
-      deliveryDirectives
+      deliveryDirectives,
+      levelInfo
     } = data;
     this.load({
       id,
@@ -32647,7 +32659,8 @@ class PlaylistLoader {
       responseType: 'text',
       type: PlaylistContextType.LEVEL,
       url,
-      deliveryDirectives
+      deliveryDirectives,
+      levelOrTrack: levelInfo
     });
   }
   onAudioTrackLoading(event, data) {
@@ -32655,7 +32668,8 @@ class PlaylistLoader {
       id,
       groupId,
       url,
-      deliveryDirectives
+      deliveryDirectives,
+      track
     } = data;
     this.load({
       id,
@@ -32664,7 +32678,8 @@ class PlaylistLoader {
       responseType: 'text',
       type: PlaylistContextType.AUDIO_TRACK,
       url,
-      deliveryDirectives
+      deliveryDirectives,
+      levelOrTrack: track
     });
   }
   onSubtitleTrackLoading(event, data) {
@@ -32672,7 +32687,8 @@ class PlaylistLoader {
       id,
       groupId,
       url,
-      deliveryDirectives
+      deliveryDirectives,
+      track
     } = data;
     this.load({
       id,
@@ -32681,9 +32697,21 @@ class PlaylistLoader {
       responseType: 'text',
       type: PlaylistContextType.SUBTITLE_TRACK,
       url,
-      deliveryDirectives
+      deliveryDirectives,
+      levelOrTrack: track
     });
   }
+  onLevelsUpdated(event, data) {
+    // abort and delete loader of removed levels
+    const loader = this.loaders[PlaylistContextType.LEVEL];
+    if (loader) {
+      const context = loader.context;
+      if (context && !data.levels.some(lvl => lvl === context.levelOrTrack)) {
+        loader.abort();
+        delete this.loaders[PlaylistContextType.LEVEL];
+      }
+    }
+  }
   load(context) {
     var _context$deliveryDire;
     const config = this.hls.config;
@@ -32694,7 +32722,7 @@ class PlaylistLoader {
     let loader = this.getInternalLoader(context);
     if (loader) {
       const loaderContext = loader.context;
-      if (loaderContext && loaderContext.url === context.url && loaderContext.level === context.level) {
+      if (loaderContext && loaderContext.url === context.url && loaderContext.levelOrTrack === context.levelOrTrack) {
         // same URL can't overlap
         this.hls.logger.trace('[playlist-loader]: playlist request ongoing');
         return;
@@ -33016,6 +33044,7 @@ class PlaylistLoader {
       case PlaylistContextType.LEVEL:
         hls.trigger(Events.LEVEL_LOADED, {
           details: levelDetails,
+          levelInfo: context.levelOrTrack || hls.levels[0],
           level: levelIndex || 0,
           id: id || 0,
           stats,
@@ -33026,6 +33055,7 @@ class PlaylistLoader {
       case PlaylistContextType.AUDIO_TRACK:
         hls.trigger(Events.AUDIO_TRACK_LOADED, {
           details: levelDetails,
+          track: context.levelOrTrack,
           id: id || 0,
           groupId: groupId || '',
           stats,
@@ -33036,6 +33066,7 @@ class PlaylistLoader {
       case PlaylistContextType.SUBTITLE_TRACK:
         hls.trigger(Events.SUBTITLE_TRACK_LOADED, {
           details: levelDetails,
+          track: context.levelOrTrack,
           id: id || 0,
           groupId: groupId || '',
           stats,