hls.js 1.6.3-0.canary.11251 → 1.6.3-0.canary.11252

package/dist/hls.d.mts

@@ -1983,6 +1983,7 @@ export declare class HlsAssetPlayer {
     resumeBuffering(): void;
     pauseBuffering(): void;
     transferMedia(): AttachMediaSourceData | null;
+    resetDetails(): void;
     on<E extends keyof HlsListeners, Context = undefined>(event: E, listener: HlsListeners[E], context?: Context): void;
     once<E extends keyof HlsListeners, Context = undefined>(event: E, listener: HlsListeners[E], context?: Context): void;
     off<E extends keyof HlsListeners, Context = undefined>(event: E, listener: HlsListeners[E], context?: Context): void;
@@ -2468,6 +2469,7 @@ export declare class InterstitialsController extends Logger implements NetworkCo
     private createAsset;
     private createAssetPlayer;
     private clearInterstitial;
+    private resetAssetPlayer;
     private clearAssetPlayer;
     private emptyPlayerQueue;
     private startAssetPlayer;

package/dist/hls.d.ts

@@ -1983,6 +1983,7 @@ export declare class HlsAssetPlayer {
     resumeBuffering(): void;
     pauseBuffering(): void;
     transferMedia(): AttachMediaSourceData | null;
+    resetDetails(): void;
     on<E extends keyof HlsListeners, Context = undefined>(event: E, listener: HlsListeners[E], context?: Context): void;
     once<E extends keyof HlsListeners, Context = undefined>(event: E, listener: HlsListeners[E], context?: Context): void;
     off<E extends keyof HlsListeners, Context = undefined>(event: E, listener: HlsListeners[E], context?: Context): void;
@@ -2468,6 +2469,7 @@ export declare class InterstitialsController extends Logger implements NetworkCo
     private createAsset;
     private createAssetPlayer;
     private clearInterstitial;
+    private resetAssetPlayer;
     private clearAssetPlayer;
     private emptyPlayerQueue;
     private startAssetPlayer;

package/dist/hls.js

@@ -1165,7 +1165,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.3-0.canary.11251");
+        newLogger.log("Debug logs enabled for \"" + context + "\" in hls.js version " + "1.6.3-0.canary.11252");
       } catch (e) {
         /* log fn threw an exception. All logger methods are no-ops. */
         return createLogger();
@@ -16677,7 +16677,7 @@
     return !remuxResult.audio && !remuxResult.video && !remuxResult.text && !remuxResult.id3 && !remuxResult.initSegment;
   }
 
-  var version = "1.6.3-0.canary.11251";
+  var version = "1.6.3-0.canary.11252";
 
   // ensure the worker ends up in the bundle
   // If the worker should not be included this gets aliased to empty.js
@@ -23392,14 +23392,18 @@
       //  using `schedule.resetErrorsInRange(start, end)`.
     };
     _proto.isAssetPastPlayoutLimit = function isAssetPastPlayoutLimit(assetIndex) {
-      if (assetIndex >= this.assetList.length) {
+      var _this$assetList$asset;
+      if (assetIndex > 0 && assetIndex >= this.assetList.length) {
         return true;
       }
       var playoutLimit = this.playoutLimit;
       if (assetIndex <= 0 || isNaN(playoutLimit)) {
         return false;
       }
-      var assetOffset = this.assetList[assetIndex].startOffset;
+      if (playoutLimit === 0) {
+        return true;
+      }
+      var assetOffset = ((_this$assetList$asset = this.assetList[assetIndex]) == null ? void 0 : _this$assetList$asset.startOffset) || 0;
       return assetOffset > playoutLimit;
     };
     _proto.findAssetIndex = function findAssetIndex(asset) {
@@ -23582,6 +23586,12 @@
     }
     return url;
   }
+  function getNextAssetIndex(interstitial, assetListIndex) {
+    while ((_interstitial$assetLi = interstitial.assetList[++assetListIndex]) != null && _interstitial$assetLi.error) {
+      var _interstitial$assetLi;
+    } /* no-op */
+    return assetListIndex;
+  }
   function eventToString(interstitial) {
     return "[\"" + interstitial.identifier + "\" " + (interstitial.cue.pre ? '<pre>' : interstitial.cue.post ? '<post>' : '') + interstitial.timelineStart.toFixed(2) + "-" + interstitial.resumeTime.toFixed(2) + "]";
   }
@@ -23712,6 +23722,19 @@
       this.bufferSnapShot();
       return this.hls.transferMedia();
     };
+    _proto.resetDetails = function resetDetails() {
+      var hls = this.hls;
+      if (this.hasDetails) {
+        hls.stopLoad();
+        var deleteDetails = function deleteDetails(obj) {
+          return delete obj.details;
+        };
+        hls.levels.forEach(deleteDetails);
+        hls.allAudioTracks.forEach(deleteDetails);
+        hls.allSubtitleTracks.forEach(deleteDetails);
+        this.hasDetails = false;
+      }
+    };
     _proto.on = function on(event, listener, context) {
       this.hls.on(event, listener);
     };
@@ -24613,7 +24636,7 @@
           return interstitial.identifier;
         });
         var interstitialsUpdated = !!(interstitialEvents.length || removedIds.length);
-        if (interstitialsUpdated) {
+        if (interstitialsUpdated || previousItems) {
           _this.log("INTERSTITIALS_UPDATED (" + interstitialEvents.length + "): " + interstitialEvents + "\nSchedule: " + scheduleItems.map(function (seg) {
             return segmentToString(seg);
           }) + " pos: " + _this.timelinePos);
@@ -24974,8 +24997,8 @@
       }
     };
     _proto.advanceAfterAssetEnded = function advanceAfterAssetEnded(interstitial, index, assetListIndex) {
-      var nextAssetIndex = assetListIndex + 1;
-      if (!interstitial.isAssetPastPlayoutLimit(nextAssetIndex) && !interstitial.assetList[nextAssetIndex].error) {
+      var nextAssetIndex = getNextAssetIndex(interstitial, assetListIndex);
+      if (!interstitial.isAssetPastPlayoutLimit(nextAssetIndex)) {
         // Advance to next asset list item
         this.setSchedulePosition(index, nextAssetIndex);
       } else {
@@ -25005,7 +25028,7 @@
       if (interstitial) {
         var itemIndex = schedule.findEventIndex(parentIdentifier);
         var assetListIndex = schedule.findAssetIndex(interstitial, time);
-        this.setSchedulePosition(itemIndex, assetListIndex);
+        this.advanceAfterAssetEnded(interstitial, itemIndex, assetListIndex - 1);
       }
     };
     _proto.setSchedulePosition = function setSchedulePosition(index, assetListIndex) {
@@ -25026,13 +25049,13 @@
         var player = assetId ? this.getAssetPlayer(assetId) : null;
         if (player && assetId && (!this.eventItemsMatch(currentItem, scheduledItem) || assetListIndex !== undefined && assetId !== ((_interstitial$assetLi = interstitial.assetList) == null ? void 0 : _interstitial$assetLi[assetListIndex].identifier))) {
           var _this$detachedData2;
-          var _assetListIndex = interstitial.findAssetIndex(playingAsset);
-          this.log("INTERSTITIAL_ASSET_ENDED " + (_assetListIndex + 1) + "/" + interstitial.assetList.length + " " + eventAssetToString(playingAsset));
+          var playingAssetListIndex = interstitial.findAssetIndex(playingAsset);
+          this.log("INTERSTITIAL_ASSET_ENDED " + (playingAssetListIndex + 1) + "/" + interstitial.assetList.length + " " + eventAssetToString(playingAsset));
           this.endedAsset = playingAsset;
           this.playingAsset = null;
           this.hls.trigger(Events.INTERSTITIAL_ASSET_ENDED, {
             asset: playingAsset,
-            assetListIndex: _assetListIndex,
+            assetListIndex: playingAssetListIndex,
             event: interstitial,
             schedule: scheduleItems.slice(0),
             scheduleIndex: index,
@@ -25091,6 +25114,12 @@
         // find asset index
         if (assetListIndex === undefined) {
           assetListIndex = this.schedule.findAssetIndex(interstitial, this.timelinePos);
+          var assetIndexCandidate = getNextAssetIndex(interstitial, assetListIndex - 1);
+          if (interstitial.isAssetPastPlayoutLimit(assetIndexCandidate)) {
+            this.advanceAfterAssetEnded(interstitial, index, assetListIndex);
+            return;
+          }
+          assetListIndex = assetIndexCandidate;
         }
         // Ensure Interstitial is enqueued
         var waitingItem = this.waitingItem;
@@ -25193,7 +25222,7 @@
       if (!scheduleItems) {
         return;
       }
-      this.log("resumed " + segmentToString(scheduledItem));
+      this.log("INTERSTITIALS_PRIMARY_RESUMED " + segmentToString(scheduledItem));
       this.hls.trigger(Events.INTERSTITIALS_PRIMARY_RESUMED, {
         schedule: scheduleItems.slice(0),
         scheduleIndex: index
@@ -25496,9 +25525,9 @@
         var bufferingPlayer = this.getBufferingPlayer();
         this.bufferingItem = item;
         this.bufferedPos = Math.max(item.start, Math.min(item.end, this.timelinePos));
+        var timeRemaining = bufferingPlayer ? bufferingPlayer.remaining : bufferingLast ? bufferingLast.end - this.timelinePos : 0;
+        this.log("INTERSTITIALS_BUFFERED_TO_BOUNDARY " + segmentToString(item) + (bufferingLast ? " (" + timeRemaining.toFixed(2) + " remaining)" : ''));
         if (!this.playbackDisabled) {
-          var timeRemaining = bufferingPlayer ? bufferingPlayer.remaining : bufferingLast ? bufferingLast.end - this.timelinePos : 0;
-          this.log("buffered to boundary " + segmentToString(item) + (bufferingLast ? " (" + timeRemaining.toFixed(2) + " remaining)" : ''));
           if (isInterstitial) {
             // primary fragment loading will exit early in base-stream-controller while `bufferingItem` is set to an Interstitial block
             item.event.assetList.forEach(function (asset) {
@@ -25682,7 +25711,6 @@
     };
     _proto.createAssetPlayer = function createAssetPlayer(interstitial, assetItem, assetListIndex) {
       var _this8 = this;
-      this.log("create HLSAssetPlayer for " + eventAssetToString(assetItem));
       var primary = this.hls;
       var userConfig = primary.userConfig;
       var videoPreference = userConfig.videoPreference;
@@ -25793,11 +25821,11 @@
         }
         // Preload at end of asset
         var scheduleIndex = _this8.schedule.findEventIndex(interstitial.identifier);
-        var assetListIndex = interstitial.findAssetIndex(assetItem);
-        var nextAssetIndex = assetListIndex + 1;
         var item = (_this8$schedule$items = _this8.schedule.items) == null ? void 0 : _this8$schedule$items[scheduleIndex];
         if (_this8.isInterstitial(item)) {
-          if (assetListIndex !== -1 && !interstitial.isAssetPastPlayoutLimit(nextAssetIndex) && !interstitial.assetList[nextAssetIndex].error) {
+          var _assetListIndex = interstitial.findAssetIndex(assetItem);
+          var nextAssetIndex = getNextAssetIndex(interstitial, _assetListIndex);
+          if (!interstitial.isAssetPastPlayoutLimit(nextAssetIndex)) {
             _this8.bufferedToItem(item, nextAssetIndex);
           } else {
             var _this8$schedule$items2;
@@ -25855,6 +25883,7 @@
         };
         _this8.handleAssetItemError(errorData, interstitial, _this8.schedule.findEventIndex(interstitial.identifier), assetListIndex, error.message);
       });
+      this.log("INTERSTITIAL_ASSET_PLAYER_CREATED " + eventAssetToString(assetItem));
       this.hls.trigger(Events.INTERSTITIAL_ASSET_PLAYER_CREATED, {
         asset: assetItem,
         assetListIndex: assetListIndex,
@@ -25871,10 +25900,20 @@
       // Remove asset list and resolved duration
       interstitial.reset();
     };
+    _proto.resetAssetPlayer = function resetAssetPlayer(assetId) {
+      // Reset asset player so that it's timeline can be adjusted without reloading the MVP
+      var playerIndex = this.getAssetPlayerQueueIndex(assetId);
+      if (playerIndex !== -1) {
+        this.log("reset asset player \"" + assetId + "\" after error");
+        var player = this.playerQueue[playerIndex];
+        this.transferMediaFromPlayer(player, null);
+        player.resetDetails();
+      }
+    };
     _proto.clearAssetPlayer = function clearAssetPlayer(assetId, toSegment) {
       var playerIndex = this.getAssetPlayerQueueIndex(assetId);
       if (playerIndex !== -1) {
-        this.log("clearAssetPlayer \"" + assetId + "\" toSegment: " + (toSegment ? segmentToString(toSegment) : toSegment));
+        this.log("clear asset player \"" + assetId + "\" toSegment: " + (toSegment ? segmentToString(toSegment) : toSegment));
         var player = this.playerQueue[playerIndex];
         this.transferMediaFromPlayer(player, toSegment);
         this.playerQueue.splice(playerIndex, 1);
@@ -25902,7 +25941,7 @@
           this.clearAssetPlayer(playingAsset.identifier, scheduleItems[scheduleIndex]);
           delete playingAsset.error;
         }
-        this.log("INTERSTITIAL_ASSET_STARTED " + (assetListIndex + 1) + "/" + assetListLength + " " + player);
+        this.log("INTERSTITIAL_ASSET_STARTED " + (assetListIndex + 1) + "/" + assetListLength + " " + eventAssetToString(assetItem));
         this.hls.trigger(Events.INTERSTITIAL_ASSET_STARTED, {
           asset: assetItem,
           assetListIndex: assetListIndex,
@@ -25919,8 +25958,8 @@
     _proto.bufferAssetPlayer = function bufferAssetPlayer(player, media) {
       var _this$schedule$items2, _this$detachedData4;
       var interstitial = player.interstitial,
-        assetItem = player.assetItem,
-        assetId = player.assetId;
+        assetItem = player.assetItem;
+        player.assetId;
       var scheduleIndex = this.schedule.findEventIndex(interstitial.identifier);
       var item = (_this$schedule$items2 = this.schedule.items) == null ? void 0 : _this$schedule$items2[scheduleIndex];
       if (!item) {
@@ -25944,7 +25983,7 @@
           return;
         }
         if (activeTracks && !isCompatibleTrackChange(activeTracks, player.tracks)) {
-          var error = new Error("Asset \"" + assetId + "\" SourceBuffer tracks ('" + Object.keys(player.tracks) + "') are not compatible with primary content tracks ('" + Object.keys(activeTracks) + "')");
+          var error = new Error("Asset " + eventAssetToString(assetItem) + " SourceBuffer tracks ('" + Object.keys(player.tracks) + "') are not compatible with primary content tracks ('" + Object.keys(activeTracks) + "')");
           var errorData = {
             fatal: true,
             type: ErrorTypes.OTHER_ERROR,
@@ -25962,12 +26001,11 @@
       if (data.details === ErrorDetails.BUFFER_STALLED_ERROR) {
         return;
       }
-      var assetItem = interstitial.assetList[assetListIndex] || null;
-      var player = null;
-      if (assetItem) {
-        var playerIndex = this.getAssetPlayerQueueIndex(assetItem.identifier);
-        player = this.playerQueue[playerIndex] || null;
-      }
+      var assetItem = interstitial.assetList[assetListIndex];
+      this.warn("INTERSTITIAL_ASSET_ERROR " + (assetItem ? eventAssetToString(assetItem) : assetItem) + " " + data.error);
+      var assetId = assetItem == null ? void 0 : assetItem.identifier;
+      var playerIndex = this.getAssetPlayerQueueIndex(assetId);
+      var player = this.playerQueue[playerIndex] || null;
       var items = this.schedule.items;
       var interstitialAssetError = _extends({}, data, {
         fatal: false,
@@ -25979,16 +26017,14 @@
         scheduleIndex: scheduleIndex,
         player: player
       });
-      this.warn("Asset item error: " + data.error);
       this.hls.trigger(Events.INTERSTITIAL_ASSET_ERROR, interstitialAssetError);
       if (!data.fatal) {
         return;
       }
+      var playingAsset = this.playingAsset;
       var error = new Error(errorMessage);
       if (assetItem) {
-        if (this.playingAsset !== assetItem) {
-          this.clearAssetPlayer(assetItem.identifier, null);
-        }
+        this.clearAssetPlayer(assetId, null);
         assetItem.error = error;
       }
 
@@ -25998,10 +26034,17 @@
       })) {
         interstitial.error = error;
       } else if (interstitial.appendInPlace) {
-        // Skip entire interstitial since moving up subsequent assets is error prone
-        interstitial.error = error;
+        // Reset level details and reload/parse media playlists to align with updated schedule
+        for (var i = assetListIndex; i < interstitial.assetList.length; i++) {
+          this.resetAssetPlayer(interstitial.assetList[i].identifier);
+        }
+        this.updateSchedule();
+      }
+      if (interstitial.error) {
+        this.primaryFallback(interstitial);
+      } else if (playingAsset && playingAsset.identifier === assetId) {
+        this.advanceAfterAssetEnded(interstitial, scheduleIndex, assetListIndex);
       }
-      this.primaryFallback(interstitial);
     };
     _proto.primaryFallback = function primaryFallback(interstitial) {
       // Fallback to Primary by on current or future events by updating schedule to skip errored interstitials/assets
@@ -26016,16 +26059,15 @@
           timelinePos = this.hls.startPosition;
         }
         var newPlayingItem = this.updateItem(playingItem, timelinePos);
-        if (!this.itemsMatch(playingItem, newPlayingItem)) {
-          var scheduleIndex = this.schedule.findItemIndexAtTime(timelinePos);
-          this.setSchedulePosition(scheduleIndex);
-        } else {
+        if (this.itemsMatch(playingItem, newPlayingItem)) {
           this.clearInterstitial(interstitial, null);
         }
         if (interstitial.appendInPlace) {
           this.attachPrimary(flushStart, null);
           this.flushFrontBuffer(flushStart);
         }
+        var scheduleIndex = this.schedule.findItemIndexAtTime(timelinePos);
+        this.setSchedulePosition(scheduleIndex);
       } else {
         this.checkStart();
       }

package/dist/hls.js.d.ts

@@ -1983,6 +1983,7 @@ export declare class HlsAssetPlayer {
     resumeBuffering(): void;
     pauseBuffering(): void;
     transferMedia(): AttachMediaSourceData | null;
+    resetDetails(): void;
     on<E extends keyof HlsListeners, Context = undefined>(event: E, listener: HlsListeners[E], context?: Context): void;
     once<E extends keyof HlsListeners, Context = undefined>(event: E, listener: HlsListeners[E], context?: Context): void;
     off<E extends keyof HlsListeners, Context = undefined>(event: E, listener: HlsListeners[E], context?: Context): void;
@@ -2468,6 +2469,7 @@ export declare class InterstitialsController extends Logger implements NetworkCo
     private createAsset;
     private createAssetPlayer;
     private clearInterstitial;
+    private resetAssetPlayer;
     private clearAssetPlayer;
     private emptyPlayerQueue;
     private startAssetPlayer;