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

package/src/controller/interstitials-controller.ts

@@ -396,8 +396,9 @@ export default class InterstitialsController
         const playingItem = c.effectivePlayingItem;
         const targetIndex = c.schedule.findItemIndexAtTime(time, timelineType);
         const targetItem = c.schedule.items?.[targetIndex];
-        const playingInterstitial = playingItem?.event;
-        const appendInPlace = playingInterstitial?.appendInPlace;
+        const bufferingPlayer = c.getBufferingPlayer();
+        const bufferingInterstitial = bufferingPlayer?.interstitial;
+        const appendInPlace = bufferingInterstitial?.appendInPlace;
         const seekInItem = playingItem && c.itemsMatch(playingItem, targetItem);
         if (playingItem && (appendInPlace || seekInItem)) {
           // seek in asset player or primary media (appendInPlace)
@@ -438,10 +439,12 @@ export default class InterstitialsController
           }
           const targetIsPrimary = !c.isInterstitial(targetItem);
           if (
-            !c.isInterstitial(playingItem) &&
+            (!c.isInterstitial(playingItem) ||
+              playingItem.event.appendInPlace) &&
             (targetIsPrimary || targetItem.event.appendInPlace)
           ) {
-            const media = c.hls.media;
+            const media =
+              c.media || (appendInPlace ? bufferingPlayer?.media : null);
             if (media) {
               media.currentTime = seekToTime;
             }
@@ -462,6 +465,7 @@ export default class InterstitialsController
             let assetIndex = 0;
             if (targetIsPrimary) {
               c.timelinePos = seekToTime;
+              c.checkBuffer();
             } else {
               const assetList = targetItem?.event?.assetList;
               if (assetList) {
@@ -840,13 +844,23 @@ MediaSource ${stringify(attachMediaSourceData)} from ${logFromSource}`,
     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
@@ -909,10 +923,10 @@ MediaSource ${stringify(attachMediaSourceData)} from ${logFromSource}`,
     // 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;
     }
@@ -996,6 +1010,7 @@ MediaSource ${stringify(attachMediaSourceData)} from ${logFromSource}`,
         const resumptionTime = interstitial.resumeTime;
         if (this.timelinePos < resumptionTime) {
           this.timelinePos = resumptionTime;
+          this.checkBuffer();
         }
         this.setSchedulePosition(nextIndex);
       }
@@ -1070,7 +1085,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();
@@ -1328,7 +1342,7 @@ MediaSource ${stringify(attachMediaSourceData)} from ${logFromSource}`,
     if (item) {
       this.setBufferingItem(item);
     } else {
-      this.bufferingItem = null;
+      this.bufferingItem = this.playingItem;
     }
     this.bufferingAsset = null;
 
@@ -1591,7 +1605,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);
       }
     }
@@ -1780,7 +1794,10 @@ Schedule: ${scheduleItems.map((seg) => segmentToString(seg))}`,
           (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
@@ -1897,7 +1914,6 @@ Schedule: ${scheduleItems.map((seg) => segmentToString(seg))}`,
           liveStartPosition = this.hls.liveSyncPosition || 0;
         }
       }
-      interstitial.assetListResponse = null;
       const assetListLoader = this.assetListLoader.loadAssetList(
         interstitial as InterstitialEventWithAssetList,
         liveStartPosition,
@@ -2205,7 +2221,8 @@ Schedule: ${scheduleItems.map((seg) => segmentToString(seg))}`,
     interstitial.assetList.forEach((asset) => {
       this.clearAssetPlayer(asset.identifier, toSegment);
     });
-    interstitial.appendInPlaceStarted = false;
+    // Remove asset list and resolved duration
+    interstitial.reset();
   }
 
   private clearAssetPlayer(

package/src/controller/interstitials-schedule.ts

@@ -91,6 +91,22 @@ export class InterstitialsSchedule extends Logger {
     this.events = this.items = null;
   }
 
+  public resetErrorsInRange(start: number, end: number): number {
+    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(): number {
     const items = this.items;
     return items ? items[items.length - 1].end : 0;

package/src/loader/interstitial-event.ts

@@ -104,8 +104,16 @@ export class InterstitialEvent {
   }
 
   public reset() {
+    this.appendInPlaceStarted = false;
     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)`.
   }
 
   public isAssetPastPlayoutLimit(assetIndex: number): boolean {