Interstitial fragment loading and buffering fixes

api-extractor/report/hls.js.api.md

@@ -428,6 +428,8 @@ export class BaseStreamController extends TaskLoop implements NetworkComponentAP
     // (undocumented)
     protected getFwdBufferInfo(bufferable: Bufferable | null, type: PlaylistLevelType): BufferInfo | null;
     // (undocumented)
+    protected getFwdBufferInfoAtPos(bufferable: Bufferable | null, pos: number, type: PlaylistLevelType, maxBufferHole: number): BufferInfo | null;
+    // (undocumented)
     protected getInitialLiveFragment(levelDetails: LevelDetails, fragments: MediaFragment[]): MediaFragment | null;
     // (undocumented)
     getLevelDetails(): LevelDetails | undefined;

src/controller/audio-stream-controller.ts

@@ -416,35 +416,38 @@ class AudioStreamController
     }
 
     // Request audio segments up to one fragment ahead of main stream-controller
-    const mainFragLoading = this.mainFragLoading?.frag;
+    let mainFragLoading = this.mainFragLoading?.frag || null;
     if (
       !this.audioOnly &&
       this.startFragRequested &&
       mainFragLoading &&
-      isMediaFragment(mainFragLoading) &&
       isMediaFragment(frag) &&
       !frag.endList &&
       (!trackDetails.live ||
         (!this.loadingParts && targetBufferTime < this.hls.liveSyncPosition!))
     ) {
-      let mainFrag = mainFragLoading;
-      if (frag.start > mainFrag.end) {
-        // Get buffered frag at target position from tracker (loaded out of sequence)
-        const mainFragAtPos = this.fragmentTracker.getFragAtPos(
-          targetBufferTime,
-          PlaylistLevelType.MAIN,
-        );
-        if (mainFragAtPos && mainFragAtPos.end > mainFragLoading.end) {
-          mainFrag = mainFragAtPos;
-          this.mainFragLoading = {
-            frag: mainFragAtPos,
-            targetBufferTime: null,
-          };
-        }
+      if (this.fragmentTracker.getState(mainFragLoading) === FragmentState.OK) {
+        this.mainFragLoading = mainFragLoading = null;
       }
-      const atBufferSyncLimit = frag.start > mainFrag.end;
-      if (atBufferSyncLimit) {
-        return;
+      if (mainFragLoading && isMediaFragment(mainFragLoading)) {
+        if (frag.start > mainFragLoading.end) {
+          // Get buffered frag at target position from tracker (loaded out of sequence)
+          const mainFragAtPos = this.fragmentTracker.getFragAtPos(
+            targetBufferTime,
+            PlaylistLevelType.MAIN,
+          );
+          if (mainFragAtPos && mainFragAtPos.end > mainFragLoading.end) {
+            mainFragLoading = mainFragAtPos;
+            this.mainFragLoading = {
+              frag: mainFragAtPos,
+              targetBufferTime: null,
+            };
+          }
+        }
+        const atBufferSyncLimit = frag.start > mainFragLoading.end;
+        if (atBufferSyncLimit) {
+          return;
+        }
       }
     }
 

src/controller/base-stream-controller.ts

@@ -488,6 +488,20 @@ export default class BaseStreamController
           }
         }
       }
+      // Skip loading of fragments that overlap completely with appendInPlace interstitals
+      const playerQueue = interstitials?.playerQueue;
+      if (playerQueue) {
+        for (let i = playerQueue.length; i--; ) {
+          const interstitial = playerQueue[i].interstitial;
+          if (
+            interstitial.appendInPlace &&
+            frag.start >= interstitial.startTime &&
+            frag.end <= interstitial.resumeTime
+          ) {
+            return;
+          }
+        }
+      }
     }
     this.startFragRequested = true;
     this._loadFragForPlayback(frag, level, targetBufferTime);
@@ -1201,7 +1215,7 @@ export default class BaseStreamController
     return this.getFwdBufferInfoAtPos(bufferable, pos, type, maxBufferHole);
   }
 
-  private getFwdBufferInfoAtPos(
+  protected getFwdBufferInfoAtPos(
     bufferable: Bufferable | null,
     pos: number,
     type: PlaylistLevelType,

src/controller/gap-controller.ts

@@ -436,9 +436,12 @@ export default class GapController extends TaskLoop {
     }
 
     const currentTime = media.currentTime;
-
+    const levelDetails = this.hls?.latestLevelDetails;
     const partial = fragmentTracker.getPartialFragment(currentTime);
-    if (partial) {
+    if (
+      partial ||
+      (levelDetails?.live && currentTime < levelDetails.fragmentStart)
+    ) {
       // Try to skip over the buffer hole caused by a partial fragment
       // This method isn't limited by the size of the gap between buffered ranges
       const targetTime = this._trySkipBufferHole(partial);

src/controller/interstitial-player.ts

@@ -77,7 +77,7 @@ export class HlsAssetPlayer {
   }
 
   get media(): HTMLMediaElement | null {
-    return this.hls.media;
+    return this.hls?.media || null;
   }
 
   get bufferedEnd(): number {
@@ -114,7 +114,7 @@ export class HlsAssetPlayer {
   }
 
   get timelineOffset(): number {
-    return this.hls.config.timelineOffset || 0;
+    return this.hls?.config.timelineOffset || 0;
   }
 
   set timelineOffset(value: number) {

src/controller/interstitials-controller.ts

@@ -613,11 +613,12 @@ export default class InterstitialsController
   // Schedule getters
   private get playingLastItem(): boolean {
     const playingItem = this.playingItem;
-    if (!this.playbackStarted || !playingItem) {
+    const items = this.schedule?.items;
+    if (!this.playbackStarted || !playingItem || !items) {
       return false;
     }
-    const items = this.schedule?.items;
-    return this.itemsMatch(playingItem, items ? items[items.length - 1] : null);
+
+    return this.findItemIndex(playingItem) === items.length - 1;
   }
 
   private get playbackStarted(): boolean {
@@ -677,6 +678,7 @@ export default class InterstitialsController
     const appendInPlace = player.interstitial.appendInPlace;
     const playerMedia = player.media;
     if (appendInPlace && playerMedia === this.primaryMedia) {
+      this.bufferingAsset = null;
       if (
         !toSegment ||
         (this.isInterstitial(toSegment) && !toSegment.event.appendInPlace)
@@ -685,14 +687,13 @@ export default class InterstitialsController
         // no-op when toSegment is undefined
         if (toSegment && playerMedia) {
           this.detachedData = { media: playerMedia };
+          return;
         }
-        return;
       }
       const attachMediaSourceData = player.transferMedia();
       this.log(
         `transfer MediaSource from ${player} ${JSON.stringify(attachMediaSourceData)}`,
       );
-      this.bufferingAsset = null;
       this.detachedData = attachMediaSourceData;
     } else if (toSegment && playerMedia) {
       this.shouldPlay ||= !playerMedia.paused;
@@ -760,7 +761,7 @@ MediaSource ${JSON.stringify(attachMediaSourceData)} from ${logFromSource}`,
       dataToAttach.overrides = {
         duration: this.schedule.duration,
         endOfStream: !isAssetPlayer || isAssetAtEndOfSchedule,
-        cueRemoval: false,
+        cueRemoval: !isAssetPlayer,
       };
     }
     player.attachMedia(dataToAttach);
@@ -1417,7 +1418,7 @@ MediaSource ${JSON.stringify(attachMediaSourceData)} from ${logFromSource}`,
     ) {
       const timelinePos = this.timelinePos;
       this.bufferedPos = timelinePos;
-      this.setBufferingItem(playingItem);
+      this.checkBuffer();
     }
   }
 
@@ -1582,7 +1583,7 @@ Schedule: ${scheduleItems.map((seg) => segmentToString(seg))}`,
         (a.event && b.event && this.eventItemsMatch(a, b)) ||
         (!a.event &&
           !b.event &&
-          a.nextEvent?.identifier === b.nextEvent?.identifier))
+          this.findItemIndex(a) === this.findItemIndex(b)))
     );
   }
 
@@ -1647,9 +1648,11 @@ Schedule: ${scheduleItems.map((seg) => segmentToString(seg))}`,
       const nextToBufferIndex = Math.min(bufferingIndex + 1, items.length - 1);
       const nextItemToBuffer = items[nextToBufferIndex];
       if (
-        bufferEndIndex === -1 &&
-        bufferingItem &&
-        bufferEnd >= bufferingItem.end
+        (bufferEndIndex === -1 &&
+          bufferingItem &&
+          bufferEnd >= bufferingItem.end) ||
+        (nextItemToBuffer.event?.appendInPlace &&
+          bufferEnd + 0.01 >= nextItemToBuffer.start)
       ) {
         bufferEndIndex = nextToBufferIndex;
       }
@@ -2136,9 +2139,6 @@ Schedule: ${scheduleItems.map((seg) => segmentToString(seg))}`,
     assetId: InterstitialAssetId,
     toSegment: InterstitialScheduleItem | null,
   ) {
-    if (toSegment === null) {
-      return;
-    }
     const playerIndex = this.getAssetPlayerQueueIndex(assetId);
     if (playerIndex !== -1) {
       this.log(

src/controller/interstitials-schedule.ts

@@ -132,6 +132,8 @@ export class InterstitialsSchedule extends Logger {
       }
       // Only return index of a Primary Item
       while (index >= 0 && items[index]?.event) {
+        // If index found is an interstitial it is not a valid result as it should have been matched up top
+        // decrement until result is negative (not found) or a primary segment
         index--;
       }
     }
@@ -592,14 +594,18 @@ export class InterstitialsSchedule extends Logger {
       );
       return false;
     }
-    return !Object.keys(mediaSelection).some((playlistType) => {
+    const playlists = Object.keys(mediaSelection);
+    return !playlists.some((playlistType) => {
       const details = mediaSelection[playlistType].details;
       const playlistEnd = details.edge;
       if (resumeTime > playlistEnd) {
-        this.log(
-          `"${interstitial.identifier}" resumption ${resumeTime} past ${playlistType} playlist end ${playlistEnd}`,
-        );
-        return true;
+        if (playlists.length > 1) {
+          this.log(
+            `"${interstitial.identifier}" resumption ${resumeTime} past ${playlistType} playlist end ${playlistEnd}`,
+          );
+          return true;
+        }
+        return false;
       }
       const startFragment = findFragmentByPTS(
         null,

src/controller/stream-controller.ts

@@ -573,15 +573,25 @@ export default class StreamController
   private onMediaSeeked = () => {
     const media = this.media;
     const currentTime = media ? media.currentTime : null;
-    if (Number.isFinite(currentTime)) {
-      this.log(`Media seeked to ${(currentTime as number).toFixed(3)}`);
+    if (currentTime === null || !Number.isFinite(currentTime)) {
+      return;
     }
 
+    this.log(`Media seeked to ${currentTime.toFixed(3)}`);
+
     // If seeked was issued before buffer was appended do not tick immediately
-    const bufferInfo = this.getMainFwdBufferInfo();
+    if (!this.getBufferedFrag(currentTime)) {
+      return;
+    }
+    const bufferInfo = this.getFwdBufferInfoAtPos(
+      media,
+      currentTime,
+      PlaylistLevelType.MAIN,
+      0,
+    );
     if (bufferInfo === null || bufferInfo.len === 0) {
       this.warn(
-        `Main forward buffer length on "seeked" event ${
+        `Main forward buffer length at ${currentTime} on "seeked" event ${
           bufferInfo ? bufferInfo.len : 'empty'
         })`,
       );