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

package/dist/hls.mjs

@@ -523,7 +523,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.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();
@@ -10237,7 +10237,7 @@ function requireEventemitter3 () {
 var eventemitter3Exports = requireEventemitter3();
 var EventEmitter = /*@__PURE__*/getDefaultExportFromCjs(eventemitter3Exports);
 
-const version = "1.6.3-0.canary.11251";
+const 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
@@ -23276,14 +23276,18 @@ class InterstitialEvent {
     //  using `schedule.resetErrorsInRange(start, end)`.
   }
   isAssetPastPlayoutLimit(assetIndex) {
-    if (assetIndex >= this.assetList.length) {
+    var _this$assetList$asset;
+    if (assetIndex > 0 && assetIndex >= this.assetList.length) {
       return true;
     }
     const playoutLimit = this.playoutLimit;
     if (assetIndex <= 0 || isNaN(playoutLimit)) {
       return false;
     }
-    const assetOffset = this.assetList[assetIndex].startOffset;
+    if (playoutLimit === 0) {
+      return true;
+    }
+    const assetOffset = ((_this$assetList$asset = this.assetList[assetIndex]) == null ? void 0 : _this$assetList$asset.startOffset) || 0;
     return assetOffset > playoutLimit;
   }
   findAssetIndex(asset) {
@@ -23429,6 +23433,12 @@ function getInterstitialUrl(uri, sessionId, baseUrl) {
   }
   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)}]`;
 }
@@ -23627,6 +23637,17 @@ class HlsAssetPlayer {
     this.bufferSnapShot();
     return this.hls.transferMedia();
   }
+  resetDetails() {
+    const hls = this.hls;
+    if (this.hasDetails) {
+      hls.stopLoad();
+      const deleteDetails = obj => delete obj.details;
+      hls.levels.forEach(deleteDetails);
+      hls.allAudioTracks.forEach(deleteDetails);
+      hls.allSubtitleTracks.forEach(deleteDetails);
+      this.hasDetails = false;
+    }
+  }
   on(event, listener, context) {
     this.hls.on(event, listener);
   }
@@ -24409,7 +24430,7 @@ class InterstitialsController extends Logger {
       const durations = schedule.durations;
       const removedIds = removedInterstitials.map(interstitial => interstitial.identifier);
       const interstitialsUpdated = !!(interstitialEvents.length || removedIds.length);
-      if (interstitialsUpdated) {
+      if (interstitialsUpdated || previousItems) {
         this.log(`INTERSTITIALS_UPDATED (${interstitialEvents.length}): ${interstitialEvents}
 Schedule: ${scheduleItems.map(seg => segmentToString(seg))} pos: ${this.timelinePos}`);
       }
@@ -25082,8 +25103,8 @@ Schedule: ${scheduleItems.map(seg => segmentToString(seg))} pos: ${this.timeline
     }
   }
   advanceAfterAssetEnded(interstitial, index, assetListIndex) {
-    const nextAssetIndex = assetListIndex + 1;
-    if (!interstitial.isAssetPastPlayoutLimit(nextAssetIndex) && !interstitial.assetList[nextAssetIndex].error) {
+    const nextAssetIndex = getNextAssetIndex(interstitial, assetListIndex);
+    if (!interstitial.isAssetPastPlayoutLimit(nextAssetIndex)) {
       // Advance to next asset list item
       this.setSchedulePosition(index, nextAssetIndex);
     } else {
@@ -25113,7 +25134,7 @@ Schedule: ${scheduleItems.map(seg => segmentToString(seg))} pos: ${this.timeline
     if (interstitial) {
       const itemIndex = schedule.findEventIndex(parentIdentifier);
       const assetListIndex = schedule.findAssetIndex(interstitial, time);
-      this.setSchedulePosition(itemIndex, assetListIndex);
+      this.advanceAfterAssetEnded(interstitial, itemIndex, assetListIndex - 1);
     }
   }
   setSchedulePosition(index, assetListIndex) {
@@ -25134,13 +25155,13 @@ Schedule: ${scheduleItems.map(seg => segmentToString(seg))} pos: ${this.timeline
       const 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$detachedData3;
-        const _assetListIndex = interstitial.findAssetIndex(playingAsset);
-        this.log(`INTERSTITIAL_ASSET_ENDED ${_assetListIndex + 1}/${interstitial.assetList.length} ${eventAssetToString(playingAsset)}`);
+        const 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,
@@ -25198,6 +25219,12 @@ Schedule: ${scheduleItems.map(seg => segmentToString(seg))} pos: ${this.timeline
       // find asset index
       if (assetListIndex === undefined) {
         assetListIndex = this.schedule.findAssetIndex(interstitial, this.timelinePos);
+        const assetIndexCandidate = getNextAssetIndex(interstitial, assetListIndex - 1);
+        if (interstitial.isAssetPastPlayoutLimit(assetIndexCandidate)) {
+          this.advanceAfterAssetEnded(interstitial, index, assetListIndex);
+          return;
+        }
+        assetListIndex = assetIndexCandidate;
       }
       // Ensure Interstitial is enqueued
       const waitingItem = this.waitingItem;
@@ -25311,7 +25338,7 @@ Schedule: ${scheduleItems.map(seg => segmentToString(seg))} pos: ${this.timeline
     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
@@ -25607,9 +25634,9 @@ Schedule: ${scheduleItems.map(seg => segmentToString(seg))} pos: ${this.timeline
       const bufferingPlayer = this.getBufferingPlayer();
       this.bufferingItem = item;
       this.bufferedPos = Math.max(item.start, Math.min(item.end, this.timelinePos));
+      const 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) {
-        const 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(asset => {
@@ -25787,7 +25814,6 @@ Schedule: ${scheduleItems.map(seg => segmentToString(seg))} pos: ${this.timeline
     return this.createAssetPlayer(interstitial, assetItem, assetListIndex);
   }
   createAssetPlayer(interstitial, assetItem, assetListIndex) {
-    this.log(`create HLSAssetPlayer for ${eventAssetToString(assetItem)}`);
     const primary = this.hls;
     const userConfig = primary.userConfig;
     let videoPreference = userConfig.videoPreference;
@@ -25896,11 +25922,11 @@ Schedule: ${scheduleItems.map(seg => segmentToString(seg))} pos: ${this.timeline
       }
       // Preload at end of asset
       const scheduleIndex = this.schedule.findEventIndex(interstitial.identifier);
-      const assetListIndex = interstitial.findAssetIndex(assetItem);
-      const nextAssetIndex = assetListIndex + 1;
       const item = (_this$schedule$items2 = this.schedule.items) == null ? void 0 : _this$schedule$items2[scheduleIndex];
       if (this.isInterstitial(item)) {
-        if (assetListIndex !== -1 && !interstitial.isAssetPastPlayoutLimit(nextAssetIndex) && !interstitial.assetList[nextAssetIndex].error) {
+        const assetListIndex = interstitial.findAssetIndex(assetItem);
+        const nextAssetIndex = getNextAssetIndex(interstitial, assetListIndex);
+        if (!interstitial.isAssetPastPlayoutLimit(nextAssetIndex)) {
           this.bufferedToItem(item, nextAssetIndex);
         } else {
           var _this$schedule$items3;
@@ -25958,6 +25984,7 @@ Schedule: ${scheduleItems.map(seg => segmentToString(seg))} pos: ${this.timeline
       };
       this.handleAssetItemError(errorData, interstitial, this.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,
@@ -25973,10 +26000,20 @@ Schedule: ${scheduleItems.map(seg => segmentToString(seg))} pos: ${this.timeline
     // Remove asset list and resolved duration
     interstitial.reset();
   }
+  resetAssetPlayer(assetId) {
+    // Reset asset player so that it's timeline can be adjusted without reloading the MVP
+    const playerIndex = this.getAssetPlayerQueueIndex(assetId);
+    if (playerIndex !== -1) {
+      this.log(`reset asset player "${assetId}" after error`);
+      const player = this.playerQueue[playerIndex];
+      this.transferMediaFromPlayer(player, null);
+      player.resetDetails();
+    }
+  }
   clearAssetPlayer(assetId, toSegment) {
     const 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}`);
       const player = this.playerQueue[playerIndex];
       this.transferMediaFromPlayer(player, toSegment);
       this.playerQueue.splice(playerIndex, 1);
@@ -26006,7 +26043,7 @@ Schedule: ${scheduleItems.map(seg => segmentToString(seg))} pos: ${this.timeline
         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,
@@ -26050,7 +26087,7 @@ Schedule: ${scheduleItems.map(seg => segmentToString(seg))} pos: ${this.timeline
         return;
       }
       if (activeTracks && !isCompatibleTrackChange(activeTracks, player.tracks)) {
-        const error = new Error(`Asset "${assetId}" SourceBuffer tracks ('${Object.keys(player.tracks)}') are not compatible with primary content tracks ('${Object.keys(activeTracks)}')`);
+        const error = new Error(`Asset ${eventAssetToString(assetItem)} SourceBuffer tracks ('${Object.keys(player.tracks)}') are not compatible with primary content tracks ('${Object.keys(activeTracks)}')`);
         const errorData = {
           fatal: true,
           type: ErrorTypes.OTHER_ERROR,
@@ -26068,12 +26105,11 @@ Schedule: ${scheduleItems.map(seg => segmentToString(seg))} pos: ${this.timeline
     if (data.details === ErrorDetails.BUFFER_STALLED_ERROR) {
       return;
     }
-    const assetItem = interstitial.assetList[assetListIndex] || null;
-    let player = null;
-    if (assetItem) {
-      const playerIndex = this.getAssetPlayerQueueIndex(assetItem.identifier);
-      player = this.playerQueue[playerIndex] || null;
-    }
+    const assetItem = interstitial.assetList[assetListIndex];
+    this.warn(`INTERSTITIAL_ASSET_ERROR ${assetItem ? eventAssetToString(assetItem) : assetItem} ${data.error}`);
+    const assetId = assetItem == null ? void 0 : assetItem.identifier;
+    const playerIndex = this.getAssetPlayerQueueIndex(assetId);
+    const player = this.playerQueue[playerIndex] || null;
     const items = this.schedule.items;
     const interstitialAssetError = _extends({}, data, {
       fatal: false,
@@ -26085,16 +26121,14 @@ Schedule: ${scheduleItems.map(seg => segmentToString(seg))} pos: ${this.timeline
       scheduleIndex,
       player
     });
-    this.warn(`Asset item error: ${data.error}`);
     this.hls.trigger(Events.INTERSTITIAL_ASSET_ERROR, interstitialAssetError);
     if (!data.fatal) {
       return;
     }
+    const playingAsset = this.playingAsset;
     const error = new Error(errorMessage);
     if (assetItem) {
-      if (this.playingAsset !== assetItem) {
-        this.clearAssetPlayer(assetItem.identifier, null);
-      }
+      this.clearAssetPlayer(assetId, null);
       assetItem.error = error;
     }
 
@@ -26102,10 +26136,17 @@ Schedule: ${scheduleItems.map(seg => segmentToString(seg))} pos: ${this.timeline
     if (!interstitial.assetList.some(asset => !asset.error)) {
       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 (let 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);
   }
   primaryFallback(interstitial) {
     // Fallback to Primary by on current or future events by updating schedule to skip errored interstitials/assets
@@ -26120,16 +26161,15 @@ Schedule: ${scheduleItems.map(seg => segmentToString(seg))} pos: ${this.timeline
         timelinePos = this.hls.startPosition;
       }
       const newPlayingItem = this.updateItem(playingItem, timelinePos);
-      if (!this.itemsMatch(playingItem, newPlayingItem)) {
-        const 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);
       }
+      const scheduleIndex = this.schedule.findItemIndexAtTime(timelinePos);
+      this.setSchedulePosition(scheduleIndex);
     } else {
       this.checkStart();
     }