hls.js 1.6.0-beta.4.0.canary.11044 → 1.6.0-beta.4.0.canary.11045

package/src/controller/base-stream-controller.ts

@@ -295,6 +295,7 @@ export default class BaseStreamController
     this.media = this.mediaBuffer = null;
     this.loopSn = undefined;
     if (transferringMedia) {
+      this.resetLoadingState();
       this.resetTransmuxer();
       return;
     }
@@ -448,67 +449,16 @@ export default class BaseStreamController
   }
 
   protected loadFragment(
-    frag: Fragment,
+    frag: MediaFragment,
     level: Level,
     targetBufferTime: number,
   ) {
-    const config = this.hls.config;
-    if (
-      __USE_INTERSTITIALS__ &&
-      config.interstitialsController &&
-      config.enableInterstitialPlayback !== false &&
-      frag.type !== PlaylistLevelType.SUBTITLE
-    ) {
-      // Do not load fragments outside the buffering schedule segment
-      const interstitials = this.hls.interstitialsManager;
-      const bufferingItem = interstitials?.bufferingItem;
-      if (bufferingItem) {
-        const bufferingInterstitial = bufferingItem.event;
-        if (bufferingInterstitial) {
-          // Do not stream fragments while buffering Interstitial Events (except for overlap at the start)
-          if (
-            bufferingInterstitial.appendInPlace ||
-            Math.abs(frag.start - bufferingItem.start) > 1 ||
-            bufferingItem.start === 0
-          ) {
-            return;
-          }
-        } else {
-          // Limit fragment loading to media in schedule item
-          if (
-            frag.end <= bufferingItem.start &&
-            level.details?.live === false
-          ) {
-            // fragment ends by schedule item start
-            return;
-          }
-          if (frag.start > bufferingItem.end && bufferingItem.nextEvent) {
-            // fragment is past schedule item end
-            return;
-          }
-        }
-      }
-      // Skip loading of fragments that overlap completely with appendInPlace interstitials
-      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);
   }
 
   private _loadFragForPlayback(
-    fragment: Fragment,
+    fragment: MediaFragment,
     level: Level,
     targetBufferTime: number,
   ) {
@@ -1352,6 +1302,7 @@ export default class BaseStreamController
       frag = this.getFragmentAtPosition(pos, end, levelDetails);
     }
 
+    frag = this.filterReplacedPrimary(frag, levelDetails);
     return this.mapToInitFragWhenRequired(frag);
   }
 
@@ -1402,6 +1353,65 @@ export default class BaseStreamController
     return nextFragment;
   }
 
+  filterReplacedPrimary(
+    frag: MediaFragment | null,
+    details: LevelDetails | undefined,
+  ): MediaFragment | null {
+    if (!frag) {
+      return frag;
+    }
+    const config = this.hls.config;
+    if (
+      __USE_INTERSTITIALS__ &&
+      config.interstitialsController &&
+      config.enableInterstitialPlayback !== false &&
+      frag.type !== PlaylistLevelType.SUBTITLE
+    ) {
+      // Do not load fragments outside the buffering schedule segment
+      const interstitials = this.hls.interstitialsManager;
+      const bufferingItem = interstitials?.bufferingItem;
+      if (bufferingItem) {
+        const bufferingInterstitial = bufferingItem.event;
+        if (bufferingInterstitial) {
+          // Do not stream fragments while buffering Interstitial Events (except for overlap at the start)
+          if (
+            bufferingInterstitial.appendInPlace ||
+            Math.abs(frag.start - bufferingItem.start) > 1 ||
+            bufferingItem.start === 0
+          ) {
+            return null;
+          }
+        } else {
+          // Limit fragment loading to media in schedule item
+          if (frag.end <= bufferingItem.start && details?.live === false) {
+            // fragment ends by schedule item start
+            // this.fragmentTracker.fragBuffered(frag, true);
+            return null;
+          }
+          if (frag.start > bufferingItem.end && bufferingItem.nextEvent) {
+            // fragment is past schedule item end
+            return null;
+          }
+        }
+      }
+      // Skip loading of fragments that overlap completely with appendInPlace interstitials
+      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 null;
+          }
+        }
+      }
+    }
+    return frag;
+  }
+
   mapToInitFragWhenRequired(frag: Fragment | null): typeof frag {
     // If an initSegment is present, it must be buffered first
     if (frag?.initSegment && !frag?.initSegment.data && !this.bitrateTest) {

package/src/controller/buffer-controller.ts

@@ -1486,6 +1486,8 @@ transfer tracks: ${stringify(transferredTracks, (key, value) => (key === 'initSe
     if (!media || !mediaSource) {
       return;
     }
+    // once received, don't listen anymore to sourceopen event
+    mediaSource.removeEventListener('sourceopen', this._onMediaSourceOpen);
     media.removeEventListener('emptied', this._onMediaEmptied);
     this.updateDuration();
     this.hls.trigger(Events.MEDIA_ATTACHED, {
@@ -1493,9 +1495,6 @@ transfer tracks: ${stringify(transferredTracks, (key, value) => (key === 'initSe
       mediaSource: mediaSource as MediaSource,
     });
 
-    // once received, don't listen anymore to sourceopen event
-    mediaSource.removeEventListener('sourceopen', this._onMediaSourceOpen);
-
     if (this.mediaSource !== null) {
       this.checkPendingTracks();
     }

package/src/controller/interstitial-player.ts

@@ -27,6 +27,7 @@ export class HlsAssetPlayer {
   public tracks: Partial<BufferCodecsData> | null = null;
   private hasDetails: boolean = false;
   private mediaAttached: HTMLMediaElement | null = null;
+  private _currentTime?: number;
 
   constructor(
     HlsPlayerClass: typeof Hls,
@@ -89,7 +90,7 @@ export class HlsAssetPlayer {
   get bufferedEnd(): number {
     const media = this.media || this.mediaAttached;
     if (!media) {
-      return 0;
+      return this.currentTime;
     }
     const bufferInfo = BufferHelper.bufferInfo(media, media.currentTime, 0.001);
     return this.getAssetTime(bufferInfo.end);
@@ -98,7 +99,7 @@ export class HlsAssetPlayer {
   get currentTime(): number {
     const media = this.media || this.mediaAttached;
     if (!media) {
-      return 0;
+      return this._currentTime || 0;
     }
     return this.getAssetTime(media.currentTime);
   }
@@ -151,6 +152,7 @@ export class HlsAssetPlayer {
   private removeMediaListeners() {
     const media = this.mediaAttached;
     if (media) {
+      this._currentTime = media.currentTime;
       media.removeEventListener('timeupdate', this.checkPlayout);
     }
   }
@@ -170,6 +172,7 @@ export class HlsAssetPlayer {
 
   detachMedia() {
     this.removeMediaListeners();
+    this.mediaAttached = null;
     this.hls.detachMedia();
   }
 
@@ -210,6 +213,6 @@ export class HlsAssetPlayer {
   }
 
   toString(): string {
-    return `HlsAssetPlayer: ${eventAssetToString(this.assetItem)} ${this.hls.sessionId} ${this.interstitial.appendInPlace ? 'append-in-place' : ''}`;
+    return `HlsAssetPlayer: ${eventAssetToString(this.assetItem)} ${this.hls?.sessionId} ${this.interstitial?.appendInPlace ? 'append-in-place' : ''}`;
   }
 }

package/src/controller/interstitials-controller.ts

@@ -195,11 +195,11 @@ export default class InterstitialsController
   }
 
   resumeBuffering() {
-    this.playerQueue.forEach((player) => player.resumeBuffering());
+    this.getBufferingPlayer()?.resumeBuffering();
   }
 
   pauseBuffering() {
-    this.playerQueue.forEach((player) => player.pauseBuffering());
+    this.getBufferingPlayer()?.pauseBuffering();
   }
 
   destroy() {
@@ -760,6 +760,9 @@ export default class InterstitialsController
     player: Hls | HlsAssetPlayer,
     media: HTMLMediaElement,
   ) {
+    if (player.media === media) {
+      return;
+    }
     let attachMediaSourceData: MediaAttachingData | null = null;
     const primaryPlayer = this.hls;
     const isAssetPlayer = player !== primaryPlayer;
@@ -768,32 +771,44 @@ export default class InterstitialsController
     const detachedMediaSource = this.detachedData?.mediaSource;
 
     let logFromSource: string;
-    if (primaryPlayer.media && appendInPlace) {
-      attachMediaSourceData = primaryPlayer.transferMedia();
-      this.detachedData = attachMediaSourceData;
+    if (primaryPlayer.media) {
+      if (appendInPlace) {
+        attachMediaSourceData = primaryPlayer.transferMedia();
+        this.detachedData = attachMediaSourceData;
+      }
       logFromSource = `Primary`;
     } else if (detachedMediaSource) {
       const bufferingPlayer = this.getBufferingPlayer();
       if (bufferingPlayer) {
         attachMediaSourceData = bufferingPlayer.transferMedia();
+        logFromSource = `${bufferingPlayer}`;
+      } else {
+        logFromSource = `detached MediaSource`;
       }
-      logFromSource = `${bufferingPlayer}`;
     } else {
-      logFromSource = `<unknown>`;
+      logFromSource = `detached media`;
     }
-    this.log(
-      `transferring to ${isAssetPlayer ? player : 'Primary'}
-MediaSource ${stringify(attachMediaSourceData)} from ${logFromSource}`,
-    );
-
     if (!attachMediaSourceData) {
       if (detachedMediaSource) {
         attachMediaSourceData = this.detachedData;
         this.log(
           `using detachedData: MediaSource ${stringify(attachMediaSourceData)}`,
         );
-      } else if (!this.detachedData || this.hls.media === media) {
-        // Media is attaching when `detachedData` and `hls.media` are populated. Detach to clear the MediaSource.
+      } else if (!this.detachedData || primaryPlayer.media === media) {
+        // Keep interstitial media transition consistent
+        const playerQueue = this.playerQueue;
+        if (playerQueue.length > 1) {
+          playerQueue.forEach((queuedPlayer) => {
+            if (
+              isAssetPlayer &&
+              queuedPlayer.interstitial.appendInPlace !== appendInPlace
+            ) {
+              const interstitial = queuedPlayer.interstitial;
+              this.clearInterstitial(queuedPlayer.interstitial, null);
+              interstitial.appendInPlace = false;
+            }
+          });
+        }
         this.hls.detachMedia();
         this.detachedData = { media };
       }
@@ -807,7 +822,7 @@ MediaSource ${stringify(attachMediaSourceData)} from ${logFromSource}`,
     this.log(
       `${transferring ? 'transfering MediaSource' : 'attaching media'} to ${
         isAssetPlayer ? player : 'Primary'
-      }`,
+      } from ${logFromSource}`,
     );
     if (dataToAttach === attachMediaSourceData) {
       const isAssetAtEndOfSchedule =
@@ -1068,7 +1083,7 @@ MediaSource ${stringify(attachMediaSourceData)} from ${logFromSource}`,
           player,
         });
         this.retreiveMediaSource(assetId, scheduledItem);
-        if (player.media && !this.detachedData) {
+        if (player.media && !this.detachedData?.mediaSource) {
           player.detachMedia();
         }
       }
@@ -1414,7 +1429,10 @@ MediaSource ${stringify(attachMediaSourceData)} from ${logFromSource}`,
       main,
     };
     this.mediaSelection = currentSelection;
-    this.schedule.parseInterstitialDateRanges(currentSelection);
+    this.schedule.parseInterstitialDateRanges(
+      currentSelection,
+      this.hls.config.interstitialAppendInPlace,
+    );
 
     if (!this.effectivePlayingItem && this.schedule.items) {
       this.checkStart();
@@ -1532,6 +1550,8 @@ MediaSource ${stringify(attachMediaSourceData)} from ${logFromSource}`,
     if (!this.playingLastItem && playingItem) {
       const playingIndex = this.findItemIndex(playingItem);
       this.setSchedulePosition(playingIndex + 1);
+    } else {
+      this.shouldPlay = false;
     }
   }
 
@@ -1552,9 +1572,6 @@ MediaSource ${stringify(attachMediaSourceData)} from ${logFromSource}`,
       interstitialEvents.length || removedIds.length
     );
     if (interstitialsUpdated) {
-      if (this.hls.config.interstitialAppendInPlace === false) {
-        interstitialEvents.forEach((event) => (event.appendInPlace = false));
-      }
       this.log(
         `INTERSTITIALS_UPDATED (${
           interstitialEvents.length
@@ -1888,18 +1905,18 @@ Schedule: ${scheduleItems.map((seg) => segmentToString(seg))}`,
     interstitial: InterstitialEvent,
     assetListIndex: number,
   ): HlsAssetPlayer | null {
+    const uri = interstitial.assetUrl;
     const assetListLength = interstitial.assetList.length;
     const neverLoaded = assetListLength === 0 && !interstitial.assetListLoader;
     const playOnce = interstitial.cue.once;
     if (neverLoaded) {
       this.log(
-        `Load interstitial asset ${assetListIndex + 1}/${assetListLength} ${interstitial}`,
+        `Load interstitial asset ${assetListIndex + 1}/${uri ? 1 : assetListLength} ${interstitial}`,
       );
       const timelineStart = interstitial.timelineStart;
       if (interstitial.appendInPlace) {
         this.flushFrontBuffer(timelineStart + 0.25);
       }
-      const uri = interstitial.assetUrl;
       if (uri) {
         return this.createAsset(
           interstitial,
@@ -2288,9 +2305,7 @@ Schedule: ${scheduleItems.map((seg) => segmentToString(seg))}`,
     }
 
     // detach media and attach to interstitial player if it does not have another element attached
-    if (!player.media) {
-      this.bufferAssetPlayer(player, media);
-    }
+    this.bufferAssetPlayer(player, media);
   }
 
   private bufferAssetPlayer(player: HlsAssetPlayer, media: HTMLMediaElement) {
@@ -2306,11 +2321,19 @@ Schedule: ${scheduleItems.map((seg) => segmentToString(seg))}`,
     if (bufferingPlayer === player) {
       return;
     }
+    const appendInPlaceNext = interstitial.appendInPlace;
+    if (
+      appendInPlaceNext &&
+      bufferingPlayer?.interstitial.appendInPlace === false
+    ) {
+      // Media is detached and not available to append in place
+      return;
+    }
     const activeTracks =
       bufferingPlayer?.tracks ||
       this.detachedData?.tracks ||
       this.requiredTracks;
-    if (interstitial.appendInPlace && assetItem !== this.playingAsset) {
+    if (appendInPlaceNext && assetItem !== this.playingAsset) {
       // Do not buffer another item if tracks are unknown or incompatible
       if (!player.tracks) {
         return;
@@ -2411,7 +2434,6 @@ Schedule: ${scheduleItems.map((seg) => segmentToString(seg))}`,
         } error: ${interstitial.error}`,
       );
       if (interstitial.appendInPlace) {
-        interstitial.appendInPlace = false;
         this.attachPrimary(flushStart, null);
         this.flushFrontBuffer(flushStart);
       }
@@ -2423,6 +2445,8 @@ Schedule: ${scheduleItems.map((seg) => segmentToString(seg))}`,
       if (!this.itemsMatch(playingItem, newPlayingItem)) {
         const scheduleIndex = this.schedule.findItemIndexAtTime(timelinePos);
         this.setSchedulePosition(scheduleIndex);
+      } else {
+        this.clearInterstitial(interstitial, null);
       }
     } else {
       this.checkStart();

package/src/controller/interstitials-schedule.ts

@@ -239,13 +239,20 @@ export class InterstitialsSchedule extends Logger {
     return null;
   }
 
-  public parseInterstitialDateRanges(mediaSelection: MediaSelection) {
+  public parseInterstitialDateRanges(
+    mediaSelection: MediaSelection,
+    enableAppendInPlace: boolean,
+  ) {
     const details = mediaSelection.main.details!;
     const { dateRanges } = details;
     const previousInterstitialEvents = this.events;
-    const interstitialEvents = this.parseDateRanges(dateRanges, {
-      url: details.url,
-    });
+    const interstitialEvents = this.parseDateRanges(
+      dateRanges,
+      {
+        url: details.url,
+      },
+      enableAppendInPlace,
+    );
     const ids = Object.keys(dateRanges);
     const removedInterstitials = previousInterstitialEvents
       ? previousInterstitialEvents.filter(
@@ -321,6 +328,7 @@ export class InterstitialsSchedule extends Logger {
   private parseDateRanges(
     dateRanges: Record<string, DateRange>,
     baseData: BaseData,
+    enableAppendInPlace: boolean,
   ): InterstitialEvent[] {
     const interstitialEvents: InterstitialEvent[] = [];
     const ids = Object.keys(dateRanges);
@@ -336,6 +344,9 @@ export class InterstitialsSchedule extends Logger {
         } else {
           interstitial = new InterstitialEvent(dateRange, baseData);
           this.eventMap[id] = interstitial;
+          if (enableAppendInPlace === false) {
+            interstitial.appendInPlace = enableAppendInPlace;
+          }
         }
         interstitialEvents.push(interstitial);
       }
@@ -570,15 +581,13 @@ export class InterstitialsSchedule extends Logger {
           interstitial.appendInPlace = false;
         }
       }
-      if (!interstitial.appendInPlace) {
+      if (!interstitial.appendInPlace && i + 1 < interstitialEvents.length) {
         // abutting Interstitials must use the same MediaSource strategy, this applies to all whether or not they are back to back:
-        for (let j = i - 1; i--; ) {
-          const timeBetween =
-            interstitialEvents[j + 1].startTime -
-            interstitialEvents[j].resumeTime;
-          if (timeBetween < ABUTTING_THRESHOLD_SECONDS) {
-            interstitialEvents[j].appendInPlace = false;
-          }
+        const timeBetween =
+          interstitialEvents[i + 1].startTime -
+          interstitialEvents[i].resumeTime;
+        if (timeBetween < ABUTTING_THRESHOLD_SECONDS) {
+          interstitialEvents[i + 1].appendInPlace = false;
         }
       }
       // Update cumulativeDuration for next abutting interstitial with the same start date

package/src/controller/subtitle-stream-controller.ts

@@ -447,7 +447,7 @@ export class SubtitleStreamController
       const fragLen = fragments.length;
       const end = trackDetails.edge;
 
-      let foundFrag: Fragment | null = null;
+      let foundFrag: MediaFragment | null = null;
       const fragPrevious = this.fragPrevious;
       if (targetBufferTime < end) {
         const tolerance = config.maxFragLookUpTolerance;
@@ -469,27 +469,28 @@ export class SubtitleStreamController
       } else {
         foundFrag = fragments[fragLen - 1];
       }
+      foundFrag = this.filterReplacedPrimary(foundFrag, track.details);
       if (!foundFrag) {
         return;
       }
-      foundFrag = this.mapToInitFragWhenRequired(foundFrag) as Fragment;
-      if (isMediaFragment(foundFrag)) {
-        // Load earlier fragment in same discontinuity to make up for misaligned playlists and cues that extend beyond end of segment
-        const curSNIdx = foundFrag.sn - trackDetails.startSN;
-        const prevFrag = fragments[curSNIdx - 1];
-        if (
-          prevFrag &&
-          prevFrag.cc === foundFrag.cc &&
-          this.fragmentTracker.getState(prevFrag) === FragmentState.NOT_LOADED
-        ) {
-          foundFrag = prevFrag;
-        }
+      // Load earlier fragment in same discontinuity to make up for misaligned playlists and cues that extend beyond end of segment
+      const curSNIdx = foundFrag.sn - trackDetails.startSN;
+      const prevFrag = fragments[curSNIdx - 1];
+      if (
+        prevFrag &&
+        prevFrag.cc === foundFrag.cc &&
+        this.fragmentTracker.getState(prevFrag) === FragmentState.NOT_LOADED
+      ) {
+        foundFrag = prevFrag;
       }
       if (
         this.fragmentTracker.getState(foundFrag) === FragmentState.NOT_LOADED
       ) {
         // only load if fragment is not loaded
-        this.loadFragment(foundFrag, track, targetBufferTime);
+        const fragToLoad = this.mapToInitFragWhenRequired(foundFrag);
+        if (fragToLoad) {
+          this.loadFragment(fragToLoad, track, targetBufferTime);
+        }
       }
     }
   }

package/src/utils/level-helper.ts

@@ -536,14 +536,11 @@ export function findPart(
 
 export function reassignFragmentLevelIndexes(levels: Level[]) {
   levels.forEach((level, index) => {
-    const fragments = level.details?.fragments;
-    if (fragments) {
-      fragments.forEach((fragment) => {
-        fragment.level = index;
-        if (fragment.initSegment) {
-          fragment.initSegment.level = index;
-        }
-      });
-    }
+    level.details?.fragments.forEach((fragment) => {
+      fragment.level = index;
+      if (fragment.initSegment) {
+        fragment.initSegment.level = index;
+      }
+    });
   });
 }