Force schedule update on asset or interstitial error (#7451)

robwalch · web-flow · commit d2c81f03d801 · 2025-08-07T00:53:30.000-07:00
* Force schedule update on asset or interstitial error (in case playout duration is not changed by error but schedule update is needed)

* Handle seeking back in interstitial with faulty assets
diff --git a/src/controller/interstitial-player.ts b/src/controller/interstitial-player.ts
@@ -87,6 +87,8 @@ export class HlsAssetPlayer {
         // issue should surface as an INTERSTITIAL_ASSET_ERROR loading the asset.
       }
       hls.loadSource(uri);
+    } else if (hls.levels.length && !(hls as any).started) {
+      hls.startLoad(-1, true);
     }
   }
 
@@ -100,7 +102,7 @@ export class HlsAssetPlayer {
     if (!media) {
       return false;
     }
-    const duration = this._bufferedEosTime || this.duration;
+    const duration = Math.min(this._bufferedEosTime || Infinity, this.duration);
     const start = this.timelineOffset;
     const bufferInfo = BufferHelper.bufferInfo(media, start, 0);
     const bufferedEnd = this.getAssetTime(bufferInfo.end);
@@ -160,6 +162,13 @@ export class HlsAssetPlayer {
     if (!duration) {
       return 0;
     }
+    const playoutLimit = this.interstitial.playoutLimit;
+    if (playoutLimit) {
+      const assetPlayout = playoutLimit - this.startOffset;
+      if (assetPlayout > 0 && assetPlayout < duration) {
+        return assetPlayout;
+      }
+    }
     return duration;
   }
 
diff --git a/src/controller/interstitials-controller.ts b/src/controller/interstitials-controller.ts
@@ -905,7 +905,7 @@ export default class InterstitialsController
         currentTime - diff,
       );
       if (resetCount) {
-        this.updateSchedule();
+        this.updateSchedule(true);
       }
     }
     this.checkBuffer();
@@ -961,6 +961,10 @@ export default class InterstitialsController
       (backwardSeek && currentTime < start) ||
       currentTime >= start + duration
     ) {
+      if (playingItem.event?.appendInPlace) {
+        this.clearInterstitial(playingItem.event, playingItem);
+        this.flushFrontBuffer(currentTime);
+      }
       this.setScheduleToAssetAtTime(currentTime, playingAsset);
     }
   };
@@ -1119,8 +1123,10 @@ export default class InterstitialsController
     if (!scheduleItems || this.playbackDisabled) {
       return;
     }
-    this.log(`setSchedulePosition ${index}, ${assetListIndex}`);
     const scheduledItem = index >= 0 ? scheduleItems[index] : null;
+    this.log(
+      `setSchedulePosition ${index}, ${assetListIndex} (${scheduledItem ? segmentToString(scheduledItem) : scheduledItem})`,
+    );
     // Cleanup current item / asset
     const currentItem = this.waitingItem || this.playingItem;
     const playingLastItem = this.playingLastItem;
@@ -1837,12 +1843,12 @@ Schedule: ${scheduleItems.map((seg) => segmentToString(seg))} pos: ${this.timeli
     return item && this.schedule ? this.schedule.findItemIndex(item, time) : -1;
   }
 
-  private updateSchedule() {
+  private updateSchedule(forceUpdate: boolean = false) {
     const mediaSelection = this.mediaSelection;
     if (!mediaSelection) {
       return;
     }
-    this.schedule?.updateSchedule(mediaSelection, []);
+    this.schedule?.updateSchedule(mediaSelection, [], forceUpdate);
   }
 
   // Schedule buffer control
@@ -2699,8 +2705,8 @@ Schedule: ${scheduleItems.map((seg) => segmentToString(seg))} pos: ${this.timeli
       for (let i = assetListIndex; i < interstitial.assetList.length; i++) {
         this.resetAssetPlayer(interstitial.assetList[i].identifier);
       }
-      this.updateSchedule();
     }
+    this.updateSchedule(true);
     if (interstitial.error) {
       this.primaryFallback(interstitial);
     } else if (playingAsset && playingAsset.identifier === assetId) {
@@ -2719,7 +2725,6 @@ Schedule: ${scheduleItems.map((seg) => segmentToString(seg))} pos: ${this.timeli
     const flushStart = interstitial.timelineStart;
     const playingItem = this.effectivePlayingItem;
     // Update schedule now that interstitial/assets are flagged with `error` for fallback
-    this.updateSchedule();
     if (playingItem) {
       this.log(
         `Fallback to primary from event "${interstitial.identifier}" start: ${
@@ -2802,6 +2807,7 @@ Schedule: ${scheduleItems.map((seg) => segmentToString(seg))} pos: ${this.timeli
             interstitial.error = new Error(
               `Interstitial no longer within playback range ${this.timelinePos} ${interstitial}`,
             );
+            this.updateSchedule(true);
             this.primaryFallback(interstitial);
             return;
           }
@@ -2837,6 +2843,7 @@ Schedule: ${scheduleItems.map((seg) => segmentToString(seg))} pos: ${this.timeli
       case ErrorDetails.ASSET_LIST_LOAD_TIMEOUT: {
         const interstitial = data.interstitial;
         if (interstitial) {
+          this.updateSchedule(true);
           this.primaryFallback(interstitial);
         }
         break;
diff --git a/src/controller/interstitials-schedule.ts b/src/controller/interstitials-schedule.ts
@@ -303,12 +303,14 @@ export class InterstitialsSchedule extends Logger {
   public updateSchedule(
     mediaSelection: MediaSelection,
     removedInterstitials: InterstitialEvent[] = [],
+    forceUpdate: boolean = false,
   ) {
     const events = this.events || [];
     if (events.length || removedInterstitials.length || this.length < 2) {
       const currentItems = this.items;
       const updatedItems = this.parseSchedule(events, mediaSelection);
       const updated =
+        forceUpdate ||
         removedInterstitials.length ||
         currentItems?.length !== updatedItems.length ||
         updatedItems.some((item, i) => {

Original file line number	Diff line number	Diff line change
`@@ -87,6 +87,8 @@ export class HlsAssetPlayer {`
`87`	`87`	`// issue should surface as an INTERSTITIAL_ASSET_ERROR loading the asset.`
`88`	`88`	`}`
`89`	`89`	`hls.loadSource(uri);`
	`90`	`+ } else if (hls.levels.length && !(hls as any).started) {`
	`91`	`+ hls.startLoad(-1, true);`
`90`	`92`	`}`
`91`	`93`	`}`
`92`	`94`
`@@ -100,7 +102,7 @@ export class HlsAssetPlayer {`
`100`	`102`	`if (!media) {`
`101`	`103`	`return false;`
`102`	`104`	`}`
`103`		`- const duration = this._bufferedEosTime \|\| this.duration;`
	`105`	`+ const duration = Math.min(this._bufferedEosTime \|\| Infinity, this.duration);`
`104`	`106`	`const start = this.timelineOffset;`
`105`	`107`	`const bufferInfo = BufferHelper.bufferInfo(media, start, 0);`
`106`	`108`	`const bufferedEnd = this.getAssetTime(bufferInfo.end);`
`@@ -160,6 +162,13 @@ export class HlsAssetPlayer {`
`160`	`162`	`if (!duration) {`
`161`	`163`	`return 0;`
`162`	`164`	`}`
	`165`	`+ const playoutLimit = this.interstitial.playoutLimit;`
	`166`	`+ if (playoutLimit) {`
	`167`	`+ const assetPlayout = playoutLimit - this.startOffset;`
	`168`	`+ if (assetPlayout > 0 && assetPlayout < duration) {`
	`169`	`+ return assetPlayout;`
	`170`	`+ }`
	`171`	`+ }`
`163`	`172`	`return duration;`
`164`	`173`	`}`
`165`	`174`