hls.js 1.6.3-0.canary.11232 → 1.6.3-0.canary.11234

package/src/controller/interstitials-controller.ts

@@ -31,8 +31,10 @@ import { Logger } from '../utils/logger';
 import { isCompatibleTrackChange } from '../utils/mediasource-helper';
 import { getBasicSelectionOption } from '../utils/rendition-helper';
 import { stringify } from '../utils/safe-json-stringify';
-import type { InterstitialPlayer } from './interstitial-player';
-import type { HlsConfig } from '../config';
+import type {
+  HlsAssetPlayerConfig,
+  InterstitialPlayer,
+} from './interstitial-player';
 import type Hls from '../hls';
 import type { LevelDetails } from '../loader/level-details';
 import type { SourceBufferName } from '../types/buffer';
@@ -1580,7 +1582,7 @@ export default class InterstitialsController
         `INTERSTITIALS_UPDATED (${
           interstitialEvents.length
         }): ${interstitialEvents}
-Schedule: ${scheduleItems.map((seg) => segmentToString(seg))}`,
+Schedule: ${scheduleItems.map((seg) => segmentToString(seg))} pos: ${this.timelinePos}`,
       );
     }
     if (removedIds.length) {
@@ -1607,11 +1609,14 @@ Schedule: ${scheduleItems.map((seg) => segmentToString(seg))}`,
 
     // Update schedule item references
     // Do not replace Interstitial playingItem without a match - used for INTERSTITIAL_ASSET_ENDED and INTERSTITIAL_ENDED
+    let trimInPlaceForPlayout: null | (() => void) = null;
     if (playingItem) {
       const updatedPlayingItem = this.updateItem(playingItem, this.timelinePos);
       if (this.itemsMatch(playingItem, updatedPlayingItem)) {
         this.playingItem = updatedPlayingItem;
         this.waitingItem = this.endedItem = null;
+        trimInPlaceForPlayout = () =>
+          this.trimInPlace(updatedPlayingItem, playingItem);
       }
     } else {
       // Clear waitingItem if it has been removed from the schedule
@@ -1627,6 +1632,8 @@ Schedule: ${scheduleItems.map((seg) => segmentToString(seg))}`,
       );
       if (this.itemsMatch(bufferingItem, updatedBufferingItem)) {
         this.bufferingItem = updatedBufferingItem;
+        trimInPlaceForPlayout ||= () =>
+          this.trimInPlace(updatedBufferingItem, bufferingItem);
       } 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 = this.playingItem;
@@ -1659,6 +1666,10 @@ Schedule: ${scheduleItems.map((seg) => segmentToString(seg))}`,
         return;
       }
 
+      if (trimInPlaceForPlayout) {
+        trimInPlaceForPlayout();
+      }
+
       // Check is buffered to new Interstitial event boundary
       // (Live update publishes Interstitial with new segment)
       this.checkBuffer();
@@ -1678,6 +1689,36 @@ Schedule: ${scheduleItems.map((seg) => segmentToString(seg))}`,
     return null;
   }
 
+  private trimInPlace(
+    updatedItem: InterstitialScheduleItem | null,
+    itemBeforeUpdate: InterstitialScheduleItem,
+  ) {
+    if (
+      this.isInterstitial(updatedItem) &&
+      updatedItem.event.appendInPlace &&
+      itemBeforeUpdate.end - updatedItem.end > 0.25
+    ) {
+      updatedItem.event.assetList.forEach((asset, index) => {
+        if (updatedItem.event.isAssetPastPlayoutLimit(index)) {
+          this.clearAssetPlayer(asset.identifier, null);
+        }
+      });
+      const flushStart = updatedItem.end + 0.25;
+      const bufferInfo = BufferHelper.bufferInfo(
+        this.primaryMedia,
+        flushStart,
+        0,
+      );
+      if (
+        bufferInfo.end > flushStart ||
+        (bufferInfo.nextStart || 0) > flushStart
+      ) {
+        this.attachPrimary(flushStart, null);
+        this.flushFrontBuffer(flushStart);
+      }
+    }
+  }
+
   private itemsMatch(
     a: InterstitialScheduleItem,
     b: InterstitialScheduleItem | null | undefined,
@@ -2101,7 +2142,7 @@ Schedule: ${scheduleItems.map((seg) => segmentToString(seg))}`,
       }
     }
     const assetId = assetItem.identifier;
-    const playerConfig: Partial<HlsConfig> = {
+    const playerConfig: HlsAssetPlayerConfig = {
       ...userConfig,
       autoStartLoad: true,
       startFragPrefetch: true,
@@ -2505,10 +2546,6 @@ Schedule: ${scheduleItems.map((seg) => segmentToString(seg))}`,
           playingItem ? segmentToString(playingItem) : '<none>'
         } error: ${interstitial.error}`,
       );
-      if (interstitial.appendInPlace) {
-        this.attachPrimary(flushStart, null);
-        this.flushFrontBuffer(flushStart);
-      }
       let timelinePos = this.timelinePos;
       if (timelinePos === -1) {
         timelinePos = this.hls.startPosition;
@@ -2520,6 +2557,10 @@ Schedule: ${scheduleItems.map((seg) => segmentToString(seg))}`,
       } else {
         this.clearInterstitial(interstitial, null);
       }
+      if (interstitial.appendInPlace) {
+        this.attachPrimary(flushStart, null);
+        this.flushFrontBuffer(flushStart);
+      }
     } else {
       this.checkStart();
     }

package/src/hls.ts

@@ -1334,6 +1334,7 @@ export type {
 } from './controller/error-controller';
 export type {
   HlsAssetPlayer,
+  HlsAssetPlayerConfig,
   InterstitialPlayer,
 } from './controller/interstitial-player';
 export type { PlayheadTimes } from './controller/interstitials-controller';