hls.js 1.6.0-beta.3.0.canary.10988 → 1.6.0-beta.3.0.canary.10989

package/dist/hls.mjs

@@ -402,7 +402,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.3.0.canary.10988"}`);
+      newLogger.log(`Debug logs enabled for "${context}" in hls.js version ${"1.6.0-beta.3.0.canary.10989"}`);
     } catch (e) {
       /* log fn threw an exception. All logger methods are no-ops. */
       return createLogger();
@@ -9938,7 +9938,7 @@ var eventemitter3 = {exports: {}};
 var eventemitter3Exports = eventemitter3.exports;
 var EventEmitter = /*@__PURE__*/getDefaultExportFromCjs(eventemitter3Exports);
 
-const version = "1.6.0-beta.3.0.canary.10988";
+const version = "1.6.0-beta.3.0.canary.10989";
 
 // ensure the worker ends up in the bundle
 // If the worker should not be included this gets aliased to empty.js
@@ -22840,8 +22840,16 @@ class InterstitialEvent {
   }
   reset() {
     var _this$assetListLoader;
+    this.appendInPlaceStarted = false;
     (_this$assetListLoader = this.assetListLoader) == null ? void 0 : _this$assetListLoader.destroy();
-    this.assetListLoader = this.error = undefined;
+    this.assetListLoader = undefined;
+    if (!this.supplementsPrimary) {
+      this.assetListResponse = null;
+      this.assetList = [];
+      this._duration = null;
+    }
+    // `error?` is reset when seeking back over interstitial `startOffset`
+    //  using `schedule.resetErrorsInRange(start, end)`.
   }
   isAssetPastPlayoutLimit(assetIndex) {
     if (assetIndex >= this.assetList.length) {
@@ -23173,6 +23181,18 @@ class InterstitialsSchedule extends Logger {
     }
     this.events = this.items = null;
   }
+  resetErrorsInRange(start, end) {
+    if (this.events) {
+      return this.events.reduce((count, interstitial) => {
+        if (start <= interstitial.startOffset && end > interstitial.startOffset) {
+          delete interstitial.error;
+          return count + 1;
+        }
+        return count;
+      }, 0);
+    }
+    return 0;
+  }
   get duration() {
     const items = this.items;
     return items ? items[items.length - 1].end : 0;
@@ -23800,13 +23820,20 @@ class InterstitialsController extends Logger {
       const backwardSeek = diff <= -0.01;
       this.timelinePos = currentTime;
       this.bufferedPos = currentTime;
-      this.checkBuffer();
 
       // Check if seeking out of an item
       const playingItem = this.playingItem;
       if (!playingItem) {
+        this.checkBuffer();
         return;
       }
+      if (backwardSeek) {
+        const resetCount = this.schedule.resetErrorsInRange(currentTime, currentTime - diff);
+        if (resetCount) {
+          this.updateSchedule();
+        }
+      }
+      this.checkBuffer();
       if (backwardSeek && currentTime < playingItem.start || currentTime >= playingItem.end) {
         var _this$media;
         const scheduleIndex = this.schedule.findItemIndexAtTime(this.timelinePos);
@@ -23856,10 +23883,10 @@ class InterstitialsController extends Logger {
       // Only allow timeupdate to advance primary position, seeking is used for jumping back
       // this prevents primaryPos from being reset to 0 after re-attach
       if (currentTime > this.timelinePos) {
+        this.timelinePos = currentTime;
         if (currentTime > this.bufferedPos) {
           this.checkBuffer();
         }
-        this.timelinePos = currentTime;
       } else {
         return;
       }
@@ -23940,7 +23967,7 @@ Schedule: ${scheduleItems.map(seg => segmentToString(seg))}`);
           this.bufferingItem = updatedBufferingItem;
         } else if (bufferingItem.event) {
           // Interstitial removed from schedule (Live -> VOD or other scenario where Start Date is outside the range of VOD Playlist)
-          this.bufferingItem = null;
+          this.bufferingItem = this.playingItem;
           this.clearInterstitial(bufferingItem.event, null);
         }
       }
@@ -24171,8 +24198,9 @@ Schedule: ${scheduleItems.map(seg => segmentToString(seg))}`);
         const playingItem = c.effectivePlayingItem;
         const targetIndex = c.schedule.findItemIndexAtTime(time, timelineType);
         const targetItem = (_c$schedule$items2 = c.schedule.items) == null ? void 0 : _c$schedule$items2[targetIndex];
-        const playingInterstitial = playingItem == null ? void 0 : playingItem.event;
-        const appendInPlace = playingInterstitial == null ? void 0 : playingInterstitial.appendInPlace;
+        const bufferingPlayer = c.getBufferingPlayer();
+        const bufferingInterstitial = bufferingPlayer == null ? void 0 : bufferingPlayer.interstitial;
+        const appendInPlace = bufferingInterstitial == null ? void 0 : bufferingInterstitial.appendInPlace;
         const seekInItem = playingItem && c.itemsMatch(playingItem, targetItem);
         if (playingItem && (appendInPlace || seekInItem)) {
           // seek in asset player or primary media (appendInPlace)
@@ -24197,8 +24225,8 @@ Schedule: ${scheduleItems.map(seg => segmentToString(seg))}`);
             seekToTime = targetItem.start + diff;
           }
           const targetIsPrimary = !c.isInterstitial(targetItem);
-          if (!c.isInterstitial(playingItem) && (targetIsPrimary || targetItem.event.appendInPlace)) {
-            const media = c.hls.media;
+          if ((!c.isInterstitial(playingItem) || playingItem.event.appendInPlace) && (targetIsPrimary || targetItem.event.appendInPlace)) {
+            const media = c.media || (appendInPlace ? bufferingPlayer == null ? void 0 : bufferingPlayer.media : null);
             if (media) {
               media.currentTime = seekToTime;
             }
@@ -24215,6 +24243,7 @@ Schedule: ${scheduleItems.map(seg => segmentToString(seg))}`);
             let assetIndex = 0;
             if (targetIsPrimary) {
               c.timelinePos = seekToTime;
+              c.checkBuffer();
             } else {
               var _targetItem$event;
               const assetList = targetItem == null ? void 0 : (_targetItem$event = targetItem.event) == null ? void 0 : _targetItem$event.assetList;
@@ -24564,6 +24593,7 @@ MediaSource ${stringify(attachMediaSourceData)} from ${logFromSource}`);
         const resumptionTime = interstitial.resumeTime;
         if (this.timelinePos < resumptionTime) {
           this.timelinePos = resumptionTime;
+          this.checkBuffer();
         }
         this.setSchedulePosition(nextIndex);
       }
@@ -24624,7 +24654,6 @@ MediaSource ${stringify(attachMediaSourceData)} from ${logFromSource}`);
           scheduleIndex: index
         });
         // Exiting an Interstitial
-        this.clearInterstitial(interstitial, scheduledItem);
         if (interstitial.cue.once) {
           // Remove interstitial with CUE attribute value of ONCE after it has played
           this.updateSchedule();
@@ -24803,7 +24832,7 @@ MediaSource ${stringify(attachMediaSourceData)} from ${logFromSource}`);
     if (item) {
       this.setBufferingItem(item);
     } else {
-      this.bufferingItem = null;
+      this.bufferingItem = this.playingItem;
     }
     this.bufferingAsset = null;
     const media = this.primaryMedia;
@@ -25033,7 +25062,7 @@ MediaSource ${stringify(attachMediaSourceData)} from ${logFromSource}`);
       const timeRemaining = bufferingPlayer ? bufferingPlayer.remaining : bufferingLast ? bufferingLast.end - this.timelinePos : 0;
       this.log(`buffered to boundary ${segmentToString(item)}` + (bufferingLast ? ` (${timeRemaining.toFixed(2)} remaining)` : ''));
       this.bufferingItem = item;
-      this.bufferedPos = item.start;
+      this.bufferedPos = Math.max(item.start, Math.min(item.end, this.timelinePos));
       if (!this.playbackDisabled) {
         if (isInterstitial) {
           // primary fragment loading will exit early in base-stream-controller while `bufferingItem` is set to an Interstitial block
@@ -25127,7 +25156,6 @@ MediaSource ${stringify(attachMediaSourceData)} from ${logFromSource}`);
           liveStartPosition = this.hls.liveSyncPosition || 0;
         }
       }
-      interstitial.assetListResponse = null;
       const assetListLoader = this.assetListLoader.loadAssetList(interstitial, liveStartPosition);
       if (assetListLoader) {
         interstitial.assetListLoader = assetListLoader;
@@ -25367,7 +25395,8 @@ MediaSource ${stringify(attachMediaSourceData)} from ${logFromSource}`);
     interstitial.assetList.forEach(asset => {
       this.clearAssetPlayer(asset.identifier, toSegment);
     });
-    interstitial.appendInPlaceStarted = false;
+    // Remove asset list and resolved duration
+    interstitial.reset();
   }
   clearAssetPlayer(assetId, toSegment) {
     const playerIndex = this.getAssetPlayerQueueIndex(assetId);