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

package/dist/hls.light.js

@@ -1028,7 +1028,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();
@@ -16882,7 +16882,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);
@@ -16893,7 +16893,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;
@@ -16931,6 +16931,7 @@
         this.hls.trigger(Events.LEVEL_LOADING, {
           url: url,
           level: currentLevelIndex,
+          levelInfo: currentLevel,
           pathwayId: currentLevel.attrs['PATHWAY-ID'],
           id: 0,
           // Deprecated Level urlId
@@ -19691,7 +19692,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
@@ -20560,7 +20561,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;
       }
@@ -20577,7 +20578,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) {
@@ -21639,6 +21640,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;
@@ -21646,6 +21648,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);
     }
 
     /**
@@ -21695,7 +21698,8 @@
         responseType: 'text',
         type: PlaylistContextType.MANIFEST,
         url: url,
-        deliveryDirectives: null
+        deliveryDirectives: null,
+        levelOrTrack: null
       });
     };
     _proto.onLevelLoading = function onLevelLoading(event, data) {
@@ -21703,7 +21707,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,
@@ -21711,14 +21716,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,
@@ -21726,14 +21733,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,
@@ -21741,9 +21750,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;
@@ -21755,7 +21778,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;
@@ -22076,6 +22099,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,
@@ -22086,6 +22110,7 @@
         case PlaylistContextType.AUDIO_TRACK:
           hls.trigger(Events.AUDIO_TRACK_LOADED, {
             details: levelDetails,
+            track: context.levelOrTrack,
             id: id || 0,
             groupId: groupId || '',
             stats: stats,
@@ -22096,6 +22121,7 @@
         case PlaylistContextType.SUBTITLE_TRACK:
           hls.trigger(Events.SUBTITLE_TRACK_LOADED, {
             details: levelDetails,
+            track: context.levelOrTrack,
             id: id || 0,
             groupId: groupId || '',
             stats: stats,