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

package/dist/hls.d.mts

@@ -2606,6 +2606,7 @@ export declare interface LevelLoadedData {
     details: LevelDetails;
     id: number;
     level: number;
+    levelInfo: Level;
     networkDetails: any;
     stats: LoaderStats;
     deliveryDirectives: HlsUrlParameters | null;
@@ -2614,6 +2615,7 @@ export declare interface LevelLoadedData {
 export declare interface LevelLoadingData {
     id: number;
     level: number;
+    levelInfo: Level;
     pathwayId: string | undefined;
     url: string;
     deliveryDirectives: HlsUrlParameters | null;
@@ -3152,6 +3154,7 @@ export declare interface PlaylistLoaderContext extends LoaderContext {
     pathwayId?: string;
     levelDetails?: LevelDetails;
     deliveryDirectives: HlsUrlParameters | null;
+    levelOrTrack: Level | MediaPlaylist | null;
 }
 
 export declare type RationalTimestamp = {
@@ -3654,11 +3657,13 @@ export declare interface TrackLoadedData {
     networkDetails: any;
     stats: LoaderStats;
     deliveryDirectives: HlsUrlParameters | null;
+    track: MediaPlaylist;
 }
 
 export declare interface TrackLoadingData {
     id: number;
     groupId: string;
+    track: MediaPlaylist;
     url: string;
     deliveryDirectives: HlsUrlParameters | null;
 }

package/dist/hls.d.ts

@@ -2606,6 +2606,7 @@ export declare interface LevelLoadedData {
     details: LevelDetails;
     id: number;
     level: number;
+    levelInfo: Level;
     networkDetails: any;
     stats: LoaderStats;
     deliveryDirectives: HlsUrlParameters | null;
@@ -2614,6 +2615,7 @@ export declare interface LevelLoadedData {
 export declare interface LevelLoadingData {
     id: number;
     level: number;
+    levelInfo: Level;
     pathwayId: string | undefined;
     url: string;
     deliveryDirectives: HlsUrlParameters | null;
@@ -3152,6 +3154,7 @@ export declare interface PlaylistLoaderContext extends LoaderContext {
     pathwayId?: string;
     levelDetails?: LevelDetails;
     deliveryDirectives: HlsUrlParameters | null;
+    levelOrTrack: Level | MediaPlaylist | null;
 }
 
 export declare type RationalTimestamp = {
@@ -3654,11 +3657,13 @@ export declare interface TrackLoadedData {
     networkDetails: any;
     stats: LoaderStats;
     deliveryDirectives: HlsUrlParameters | null;
+    track: MediaPlaylist;
 }
 
 export declare interface TrackLoadingData {
     id: number;
     groupId: string;
+    track: MediaPlaylist;
     url: string;
     deliveryDirectives: HlsUrlParameters | null;
 }

package/dist/hls.js

@@ -1057,7 +1057,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.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();
@@ -2546,8 +2546,10 @@
             return 0; // continue
           }
           if (config.useMediaCapabilities && !levelInfo.supportedResult && !levelInfo.supportedPromise) {
+            var _levelInfo$videoCodec;
             var 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(function (decodingInfo) {
                 if (!_this3.hls) {
@@ -2563,6 +2565,9 @@
                   if (index > -1 && levels.length > 1) {
                     _this3.log("Removing unsupported level " + index);
                     _this3.hls.removeLevel(index);
+                    if (_this3.hls.loadLevel === -1) {
+                      _this3.hls.nextLoadLevel = 0;
+                    }
                   }
                 }
               });
@@ -16217,7 +16222,7 @@
     return !remuxResult.audio && !remuxResult.video && !remuxResult.text && !remuxResult.id3 && !remuxResult.initSegment;
   }
 
-  var version = "1.6.0-beta.1.0.canary.10764";
+  var 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
@@ -17925,7 +17930,8 @@
           url: url,
           id: id,
           groupId: groupId,
-          deliveryDirectives: hlsUrlParameters || null
+          deliveryDirectives: hlsUrlParameters || null,
+          track: audioTrack
         });
       }
     };
@@ -26290,7 +26296,8 @@
           url: url,
           id: id,
           groupId: groupId,
-          deliveryDirectives: hlsUrlParameters || null
+          deliveryDirectives: hlsUrlParameters || null,
+          track: currentTrack
         });
       }
     }
@@ -31264,7 +31271,7 @@
       var _data$deliveryDirecti2;
       var level = data.level,
         details = data.details;
-      var curLevel = this._levels[level];
+      var curLevel = data.levelInfo;
       if (!curLevel) {
         var _data$deliveryDirecti;
         this.warn("Invalid level index " + level);
@@ -31275,7 +31282,7 @@
       }
 
       // 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;
@@ -31313,6 +31320,7 @@
         this.hls.trigger(Events.LEVEL_LOADING, {
           url: url,
           level: currentLevelIndex,
+          levelInfo: currentLevel,
           pathwayId: currentLevel.attrs['PATHWAY-ID'],
           id: 0,
           // Deprecated Level urlId
@@ -32373,7 +32381,7 @@
       if (!levels || this.state !== State.IDLE) {
         return;
       }
-      var level = levels[data.level];
+      var level = data.levelInfo;
       if (!level.details || level.details.live && this.levelLastLoaded !== level || this.waitForCdnTuneIn(level.details)) {
         this.state = State.WAITING_LEVEL;
       }
@@ -32390,7 +32398,7 @@
         return;
       }
       this.log("Level " + newLevelId + " loaded [" + newDetails.startSN + "," + newDetails.endSN + "]" + (newDetails.lastPartSn ? "[part-" + newDetails.lastPartSn + "-" + newDetails.lastPartIndex + "]" : '') + ", cc [" + newDetails.startCC + ", " + newDetails.endCC + "] duration:" + duration);
-      var curLevel = levels[newLevelId];
+      var curLevel = data.levelInfo;
       var fragCurrent = this.fragCurrent;
       if (fragCurrent && (this.state === State.FRAG_LOADING || this.state === State.FRAG_LOADING_WAITING_RETRY)) {
         if (fragCurrent.level !== data.level && fragCurrent.loader) {
@@ -33452,6 +33460,7 @@
       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);
     };
     _proto.unregisterListeners = function unregisterListeners() {
       var hls = this.hls;
@@ -33459,6 +33468,7 @@
       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);
     }
 
     /**
@@ -33508,7 +33518,8 @@
         responseType: 'text',
         type: PlaylistContextType.MANIFEST,
         url: url,
-        deliveryDirectives: null
+        deliveryDirectives: null,
+        levelOrTrack: null
       });
     };
     _proto.onLevelLoading = function onLevelLoading(event, data) {
@@ -33516,7 +33527,8 @@
         level = data.level,
         pathwayId = data.pathwayId,
         url = data.url,
-        deliveryDirectives = data.deliveryDirectives;
+        deliveryDirectives = data.deliveryDirectives,
+        levelInfo = data.levelInfo;
       this.load({
         id: id,
         level: level,
@@ -33524,14 +33536,16 @@
         responseType: 'text',
         type: PlaylistContextType.LEVEL,
         url: url,
-        deliveryDirectives: deliveryDirectives
+        deliveryDirectives: deliveryDirectives,
+        levelOrTrack: levelInfo
       });
     };
     _proto.onAudioTrackLoading = function onAudioTrackLoading(event, data) {
       var id = data.id,
         groupId = data.groupId,
         url = data.url,
-        deliveryDirectives = data.deliveryDirectives;
+        deliveryDirectives = data.deliveryDirectives,
+        track = data.track;
       this.load({
         id: id,
         groupId: groupId,
@@ -33539,14 +33553,16 @@
         responseType: 'text',
         type: PlaylistContextType.AUDIO_TRACK,
         url: url,
-        deliveryDirectives: deliveryDirectives
+        deliveryDirectives: deliveryDirectives,
+        levelOrTrack: track
       });
     };
     _proto.onSubtitleTrackLoading = function onSubtitleTrackLoading(event, data) {
       var id = data.id,
         groupId = data.groupId,
         url = data.url,
-        deliveryDirectives = data.deliveryDirectives;
+        deliveryDirectives = data.deliveryDirectives,
+        track = data.track;
       this.load({
         id: id,
         groupId: groupId,
@@ -33554,9 +33570,23 @@
         responseType: 'text',
         type: PlaylistContextType.SUBTITLE_TRACK,
         url: url,
-        deliveryDirectives: deliveryDirectives
+        deliveryDirectives: deliveryDirectives,
+        levelOrTrack: track
       });
     };
+    _proto.onLevelsUpdated = function onLevelsUpdated(event, data) {
+      // abort and delete loader of removed levels
+      var loader = this.loaders[PlaylistContextType.LEVEL];
+      if (loader) {
+        var context = loader.context;
+        if (context && !data.levels.some(function (lvl) {
+          return lvl === context.levelOrTrack;
+        })) {
+          loader.abort();
+          delete this.loaders[PlaylistContextType.LEVEL];
+        }
+      }
+    };
     _proto.load = function load(context) {
       var _context$deliveryDire,
         _this = this;
@@ -33568,7 +33598,7 @@
       var loader = this.getInternalLoader(context);
       if (loader) {
         var 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;
@@ -33889,6 +33919,7 @@
         case PlaylistContextType.LEVEL:
           hls.trigger(Events.LEVEL_LOADED, {
             details: levelDetails,
+            levelInfo: context.levelOrTrack || hls.levels[0],
             level: levelIndex || 0,
             id: id || 0,
             stats: stats,
@@ -33899,6 +33930,7 @@
         case PlaylistContextType.AUDIO_TRACK:
           hls.trigger(Events.AUDIO_TRACK_LOADED, {
             details: levelDetails,
+            track: context.levelOrTrack,
             id: id || 0,
             groupId: groupId || '',
             stats: stats,
@@ -33909,6 +33941,7 @@
         case PlaylistContextType.SUBTITLE_TRACK:
           hls.trigger(Events.SUBTITLE_TRACK_LOADED, {
             details: levelDetails,
+            track: context.levelOrTrack,
             id: id || 0,
             groupId: groupId || '',
             stats: stats,

package/dist/hls.js.d.ts

@@ -2606,6 +2606,7 @@ export declare interface LevelLoadedData {
     details: LevelDetails;
     id: number;
     level: number;
+    levelInfo: Level;
     networkDetails: any;
     stats: LoaderStats;
     deliveryDirectives: HlsUrlParameters | null;
@@ -2614,6 +2615,7 @@ export declare interface LevelLoadedData {
 export declare interface LevelLoadingData {
     id: number;
     level: number;
+    levelInfo: Level;
     pathwayId: string | undefined;
     url: string;
     deliveryDirectives: HlsUrlParameters | null;
@@ -3152,6 +3154,7 @@ export declare interface PlaylistLoaderContext extends LoaderContext {
     pathwayId?: string;
     levelDetails?: LevelDetails;
     deliveryDirectives: HlsUrlParameters | null;
+    levelOrTrack: Level | MediaPlaylist | null;
 }
 
 export declare type RationalTimestamp = {
@@ -3654,11 +3657,13 @@ export declare interface TrackLoadedData {
     networkDetails: any;
     stats: LoaderStats;
     deliveryDirectives: HlsUrlParameters | null;
+    track: MediaPlaylist;
 }
 
 export declare interface TrackLoadingData {
     id: number;
     groupId: string;
+    track: MediaPlaylist;
     url: string;
     deliveryDirectives: HlsUrlParameters | null;
 }