hls.js 1.6.0-rc.1.0.canary.11079 → 1.6.0-rc.1.0.canary.11080

package/dist/hls.mjs

@@ -402,7 +402,7 @@ function enableLogs(debugConfig, context, id) {
     // Some browsers don't allow to use bind on console object anyway
     // fallback to default if needed
     try {
-      newLogger.log(`Debug logs enabled for "${context}" in hls.js version ${"1.6.0-rc.1.0.canary.11079"}`);
+      newLogger.log(`Debug logs enabled for "${context}" in hls.js version ${"1.6.0-rc.1.0.canary.11080"}`);
     } catch (e) {
       /* log fn threw an exception. All logger methods are no-ops. */
       return createLogger();
@@ -8453,6 +8453,14 @@ class BaseStreamController extends TaskLoop {
       return (_this$levelLastLoaded = this.levelLastLoaded) == null ? void 0 : _this$levelLastLoaded.details;
     }
   }
+  get timelineOffset() {
+    const configuredTimelineOffset = this.config.timelineOffset;
+    if (configuredTimelineOffset) {
+      var _this$getLevelDetails;
+      return ((_this$getLevelDetails = this.getLevelDetails()) == null ? void 0 : _this$getLevelDetails.appliedTimelineOffset) || configuredTimelineOffset;
+    }
+    return 0;
+  }
   onMediaAttached(event, data) {
     const media = this.media = this.mediaBuffer = data.media;
     media.removeEventListener('seeking', this.onMediaSeeking);
@@ -9150,8 +9158,8 @@ class BaseStreamController extends TaskLoop {
       const end = this.loadingParts ? levelDetails.partEnd : levelDetails.fragmentEnd;
       frag = this.getFragmentAtPosition(pos, end, levelDetails);
     }
-    frag = this.filterReplacedPrimary(frag, levelDetails);
-    return this.mapToInitFragWhenRequired(frag);
+    const programFrag = this.filterReplacedPrimary(frag, levelDetails);
+    return this.mapToInitFragWhenRequired(programFrag);
   }
   isLoopLoading(frag, targetBufferTime) {
     const trackerState = this.fragmentTracker.getState(frag);
@@ -9178,12 +9186,21 @@ class BaseStreamController extends TaskLoop {
     this.loopSn = undefined;
     return nextFragment;
   }
+  get primaryPrefetch() {
+    if (interstitialsEnabled(this.hls.config)) {
+      var _this$hls$interstitia, _this$hls$interstitia2;
+      const playingInterstitial = (_this$hls$interstitia = this.hls.interstitialsManager) == null ? void 0 : (_this$hls$interstitia2 = _this$hls$interstitia.playingItem) == null ? void 0 : _this$hls$interstitia2.event;
+      if (playingInterstitial) {
+        return true;
+      }
+    }
+    return false;
+  }
   filterReplacedPrimary(frag, details) {
     if (!frag) {
       return frag;
     }
-    const config = this.hls.config;
-    if (config.interstitialsController && config.enableInterstitialPlayback !== false && frag.type !== PlaylistLevelType.SUBTITLE) {
+    if (interstitialsEnabled(this.hls.config) && frag.type !== PlaylistLevelType.SUBTITLE) {
       // Do not load fragments outside the buffering schedule segment
       const interstitials = this.hls.interstitialsManager;
       const bufferingItem = interstitials == null ? void 0 : interstitials.bufferingItem;
@@ -9203,7 +9220,10 @@ class BaseStreamController extends TaskLoop {
           }
           if (frag.start > bufferingItem.end && bufferingItem.nextEvent) {
             // fragment is past schedule item end
-            return null;
+            // allow some overflow when not appending in place to prevent stalls
+            if (bufferingItem.nextEvent.appendInPlace || frag.start - bufferingItem.end > 1) {
+              return null;
+            }
           }
         }
       }
@@ -9389,6 +9409,7 @@ class BaseStreamController extends TaskLoop {
     if (startPosition < sliding) {
       startPosition = -1;
     }
+    const timelineOffset = this.timelineOffset;
     if (startPosition === -1) {
       // Use Playlist EXT-X-START:TIME-OFFSET when set
       // Prioritize Multivariant Playlist offset so that main, audio, and subtitle stream-controller start times match
@@ -9412,9 +9433,9 @@ class BaseStreamController extends TaskLoop {
         this.log(`setting startPosition to 0 by default`);
         this.startPosition = startPosition = 0;
       }
-      this.lastCurrentTime = startPosition;
+      this.lastCurrentTime = startPosition + timelineOffset;
     }
-    this.nextLoadPosition = startPosition;
+    this.nextLoadPosition = startPosition + timelineOffset;
   }
   getLoadPosition() {
     var _this$hls;
@@ -9694,6 +9715,9 @@ class BaseStreamController extends TaskLoop {
     return this._state;
   }
 }
+function interstitialsEnabled(config) {
+  return !!config.interstitialsController && config.enableInterstitialPlayback !== false;
+}
 
 class ChunkCache {
   constructor() {
@@ -10086,7 +10110,7 @@ function requireEventemitter3 () {
 var eventemitter3Exports = requireEventemitter3();
 var EventEmitter = /*@__PURE__*/getDefaultExportFromCjs(eventemitter3Exports);
 
-const version = "1.6.0-rc.1.0.canary.11079";
+const version = "1.6.0-rc.1.0.canary.11080";
 
 // ensure the worker ends up in the bundle
 // If the worker should not be included this gets aliased to empty.js
@@ -16441,7 +16465,7 @@ class AudioStreamController extends BaseStreamController {
     const cc = mainFrag.cc;
     return findNearestWithCC(trackDetails, cc, mainFrag) || trackDetails && findFragWithCC(trackDetails.fragments, cc) || mainFrag;
   }
-  startLoad(startPosition) {
+  startLoad(startPosition, skipSeekToStartPosition) {
     if (!this.levels) {
       this.startPosition = startPosition;
       this.state = State.STOPPED;
@@ -16457,7 +16481,8 @@ class AudioStreamController extends BaseStreamController {
     } else {
       this.state = State.WAITING_TRACK;
     }
-    this.nextLoadPosition = this.startPosition = this.lastCurrentTime = startPosition;
+    this.nextLoadPosition = this.lastCurrentTime = startPosition + this.timelineOffset;
+    this.startPosition = skipSeekToStartPosition ? -1 : startPosition;
     this.tick();
   }
   doTick() {
@@ -16581,7 +16606,7 @@ class AudioStreamController extends BaseStreamController {
     // 3. if tracks or track not loaded and selected
     // then exit loop
     // => if media not attached but start frag prefetch is enabled and start frag not requested yet, we will not exit loop
-    if (!this.buffering || !media && (this.startFragRequested || !config.startFragPrefetch) || !(levels != null && levels[trackId])) {
+    if (!this.buffering || !media && !this.primaryPrefetch && (this.startFragRequested || !config.startFragPrefetch) || !(levels != null && levels[trackId])) {
       return;
     }
     const levelInfo = levels[trackId];
@@ -18822,17 +18847,10 @@ transfer tracks: ${stringify(transferredTracks, (key, value) => key === 'initSeg
       return type && !((_this$tracks$type4 = this.tracks[type]) != null && _this$tracks$type4.ended);
     });
     if (allTracksEnding) {
-      this.log(`Queueing EOS`);
-      this.blockUntilOpen(() => {
-        this.sourceBuffers.forEach(([type]) => {
-          if (type !== null) {
-            const track = this.tracks[type];
-            if (track) {
-              track.ending = false;
-            }
-          }
-        });
-        if (allowEndOfStream) {
+      if (allowEndOfStream) {
+        this.log(`Queueing EOS`);
+        this.blockUntilOpen(() => {
+          this.tracksEnded();
           const {
             mediaSource
           } = this;
@@ -18845,11 +18863,24 @@ transfer tracks: ${stringify(transferredTracks, (key, value) => key === 'initSeg
           this.log(`Calling mediaSource.endOfStream()`);
           // Allow this to throw and be caught by the enqueueing function
           mediaSource.endOfStream();
-        }
+          this.hls.trigger(Events.BUFFERED_TO_END, undefined);
+        });
+      } else {
+        this.tracksEnded();
         this.hls.trigger(Events.BUFFERED_TO_END, undefined);
-      });
+      }
     }
   }
+  tracksEnded() {
+    this.sourceBuffers.forEach(([type]) => {
+      if (type !== null) {
+        const track = this.tracks[type];
+        if (track) {
+          track.ending = false;
+        }
+      }
+    });
+  }
   onLevelUpdated(event, {
     details
   }) {
@@ -22980,7 +23011,7 @@ function hash(text) {
   return (hash >>> 0).toString();
 }
 
-const ALIGNED_END_THRESHOLD_SECONDS = 0.02;
+const ALIGNED_END_THRESHOLD_SECONDS = 0.025;
 let TimelineOccupancy = /*#__PURE__*/function (TimelineOccupancy) {
   TimelineOccupancy[TimelineOccupancy["Point"] = 0] = "Point";
   TimelineOccupancy[TimelineOccupancy["Range"] = 1] = "Range";
@@ -23014,6 +23045,7 @@ class InterstitialEvent {
     this.assetListResponse = null;
     this.resumeAnchor = void 0;
     this.error = void 0;
+    this.resetOnResume = void 0;
     this.base = base;
     this.dateRange = dateRange;
     this.setDateRange(dateRange);
@@ -23073,6 +23105,18 @@ class InterstitialEvent {
   get startOffset() {
     return this.cue.pre ? 0 : this.startTime;
   }
+  get startIsAligned() {
+    if (this.startTime === 0 || this.snapOptions.out) {
+      return true;
+    }
+    const frag = this.dateRange.tagAnchor;
+    if (frag) {
+      const startTime = this.dateRange.startTime;
+      const snappedStart = getSnapToFragmentTime(startTime, frag);
+      return startTime - snappedStart < 0.1;
+    }
+    return false;
+  }
   get resumptionOffset() {
     const resumeOffset = this.resumeOffset;
     const offset = isFiniteNumber(resumeOffset) ? resumeOffset : this.duration;
@@ -23090,18 +23134,22 @@ class InterstitialEvent {
     return resumeTime;
   }
   get appendInPlace() {
+    if (this.appendInPlaceStarted) {
+      return true;
+    }
     if (this.appendInPlaceDisabled) {
       return false;
     }
-    if (!this.cue.once && !this.cue.pre && (
+    if (!this.cue.once && !this.cue.pre &&
     // preroll starts at startPosition before startPosition is known (live)
-    this.startTime === 0 || this.snapOptions.out) && (isNaN(this.playoutLimit) && isNaN(this.resumeOffset) || this.resumeOffset && this.duration && Math.abs(this.resumeOffset - this.duration) < ALIGNED_END_THRESHOLD_SECONDS)) {
+    this.startIsAligned && (isNaN(this.playoutLimit) && isNaN(this.resumeOffset) || this.resumeOffset && this.duration && Math.abs(this.resumeOffset - this.duration) < ALIGNED_END_THRESHOLD_SECONDS)) {
       return true;
     }
     return false;
   }
   set appendInPlace(value) {
     if (this.appendInPlaceStarted) {
+      this.resetOnResume = !value;
       return;
     }
     this.appendInPlaceDisabled = !value;
@@ -23194,6 +23242,7 @@ class HlsAssetPlayer {
     this.hasDetails = false;
     this.mediaAttached = null;
     this._currentTime = void 0;
+    this._bufferedEosTime = void 0;
     this.checkPlayout = () => {
       const interstitial = this.interstitial;
       const playoutLimit = interstitial.playoutLimit;
@@ -23230,9 +23279,25 @@ class HlsAssetPlayer {
       }
     });
   }
-  get destroyed() {
+  bufferedInPlaceToEnd(media) {
     var _this$hls;
-    return !((_this$hls = this.hls) != null && _this$hls.userConfig);
+    if (!this.interstitial.appendInPlace) {
+      return false;
+    }
+    if ((_this$hls = this.hls) != null && _this$hls.bufferedToEnd) {
+      return true;
+    }
+    if (!media || !this._bufferedEosTime) {
+      return false;
+    }
+    const start = this.timelineOffset;
+    const bufferInfo = BufferHelper.bufferInfo(media, start, 0);
+    const bufferedEnd = this.getAssetTime(bufferInfo.end);
+    return bufferedEnd >= this._bufferedEosTime - 0.02;
+  }
+  get destroyed() {
+    var _this$hls2;
+    return !((_this$hls2 = this.hls) != null && _this$hls2.userConfig);
   }
   get assetId() {
     return this.assetItem.identifier;
@@ -23241,12 +23306,15 @@ class HlsAssetPlayer {
     return this.assetItem.parentIdentifier;
   }
   get media() {
-    var _this$hls2;
-    return ((_this$hls2 = this.hls) == null ? void 0 : _this$hls2.media) || null;
+    var _this$hls3;
+    return ((_this$hls3 = this.hls) == null ? void 0 : _this$hls3.media) || null;
   }
   get bufferedEnd() {
     const media = this.media || this.mediaAttached;
     if (!media) {
+      if (this._bufferedEosTime) {
+        return this._bufferedEosTime;
+      }
       return this.currentTime;
     }
     const bufferInfo = BufferHelper.bufferInfo(media, media.currentTime, 0.001);
@@ -23277,8 +23345,8 @@ class HlsAssetPlayer {
     return this.assetItem.startOffset;
   }
   get timelineOffset() {
-    var _this$hls3;
-    return ((_this$hls3 = this.hls) == null ? void 0 : _this$hls3.config.timelineOffset) || 0;
+    var _this$hls4;
+    return ((_this$hls4 = this.hls) == null ? void 0 : _this$hls4.config.timelineOffset) || 0;
   }
   set timelineOffset(value) {
     const timelineOffset = this.timelineOffset;
@@ -23301,9 +23369,18 @@ class HlsAssetPlayer {
     const media = this.mediaAttached;
     if (media) {
       this._currentTime = media.currentTime;
+      this.bufferSnapShot();
       media.removeEventListener('timeupdate', this.checkPlayout);
     }
   }
+  bufferSnapShot() {
+    if (this.mediaAttached) {
+      var _this$hls5;
+      if ((_this$hls5 = this.hls) != null && _this$hls5.bufferedToEnd) {
+        this._bufferedEosTime = this.bufferedEnd;
+      }
+    }
+  }
   destroy() {
     this.removeMediaListeners();
     this.hls.destroy();
@@ -23327,6 +23404,7 @@ class HlsAssetPlayer {
     this.hls.pauseBuffering();
   }
   transferMedia() {
+    this.bufferSnapShot();
     return this.hls.transferMedia();
   }
   on(event, listener, context) {
@@ -23339,8 +23417,8 @@ class HlsAssetPlayer {
     this.hls.off(event, listener);
   }
   toString() {
-    var _this$hls4, _this$interstitial;
-    return `HlsAssetPlayer: ${eventAssetToString(this.assetItem)} ${(_this$hls4 = this.hls) == null ? void 0 : _this$hls4.sessionId} ${(_this$interstitial = this.interstitial) != null && _this$interstitial.appendInPlace ? 'append-in-place' : ''}`;
+    var _this$hls6, _this$interstitial;
+    return `HlsAssetPlayer: ${eventAssetToString(this.assetItem)} ${(_this$hls6 = this.hls) == null ? void 0 : _this$hls6.sessionId} ${(_this$interstitial = this.interstitial) != null && _this$interstitial.appendInPlace ? 'append-in-place' : ''}`;
   }
 }
 
@@ -23787,6 +23865,9 @@ class InterstitialsSchedule extends Logger {
         const timeBetween = interstitialEvents[i + 1].startTime - interstitialEvents[i].resumeTime;
         if (timeBetween < ABUTTING_THRESHOLD_SECONDS) {
           interstitialEvents[i + 1].appendInPlace = false;
+          if (interstitialEvents[i + 1].appendInPlace) {
+            this.warn(`Could not change append strategy for abutting event ${interstitial}`);
+          }
         }
       }
       // Update cumulativeDuration for next abutting interstitial with the same start date
@@ -23810,19 +23891,18 @@ class InterstitialsSchedule extends Logger {
       const details = mediaSelection[playlistType].details;
       const playlistEnd = details.edge;
       if (resumeTime > playlistEnd) {
-        if (playlists.length > 1) {
-          this.log(`"${interstitial.identifier}" resumption ${resumeTime} past ${playlistType} playlist end ${playlistEnd}`);
-          return true;
-        }
+        // Live playback - resumption segments are not yet available
+        this.log(`"${interstitial.identifier}" resumption ${resumeTime} past ${playlistType} playlist end ${playlistEnd}`);
+        // Assume alignment is possible (or reset can take place)
         return false;
       }
       const startFragment = findFragmentByPTS(null, details.fragments, resumeTime);
       if (!startFragment) {
-        this.log(`"${interstitial.identifier}" resumption ${resumeTime} does not align with any fragments in ${playlistType} playlist`);
+        this.log(`"${interstitial.identifier}" resumption ${resumeTime} does not align with any fragments in ${playlistType} playlist (${details.fragStart}-${details.fragmentEnd})`);
         return true;
       }
-      const endAllowance = playlistType === 'audio' ? 0.175 : 0;
-      const alignedWithSegment = Math.abs(startFragment.start - resumeTime) < ALIGNED_END_THRESHOLD_SECONDS || Math.abs(startFragment.end - resumeTime) < ALIGNED_END_THRESHOLD_SECONDS + endAllowance;
+      const allowance = playlistType === 'audio' ? 0.175 : 0;
+      const alignedWithSegment = Math.abs(startFragment.start - resumeTime) < ALIGNED_END_THRESHOLD_SECONDS + allowance || Math.abs(startFragment.end - resumeTime) < ALIGNED_END_THRESHOLD_SECONDS + allowance;
       if (!alignedWithSegment) {
         this.log(`"${interstitial.identifier}" resumption ${resumeTime} not aligned with ${playlistType} fragment bounds (${startFragment.start}-${startFragment.end} sn: ${startFragment.sn} cc: ${startFragment.cc})`);
         return true;
@@ -23872,7 +23952,7 @@ class AssetListLoader {
     // @ts-ignore
     this.hls = null;
   }
-  loadAssetList(interstitial, liveStartPosition) {
+  loadAssetList(interstitial, hlsStartOffset) {
     const assetListUrl = interstitial.assetListUrl;
     let url;
     try {
@@ -23882,11 +23962,8 @@ class AssetListLoader {
       this.hls.trigger(Events.ERROR, errorData);
       return;
     }
-    if (liveStartPosition && !(interstitial.cue.pre || interstitial.cue.post) && url.protocol !== 'data:') {
-      const startOffset = liveStartPosition - interstitial.startTime;
-      if (startOffset > 0) {
-        url.searchParams.set('_HLS_start_offset', '' + Math.round(startOffset * 1000) / 1000);
-      }
+    if (hlsStartOffset && url.protocol !== 'data:') {
+      url.searchParams.set('_HLS_start_offset', '' + hlsStartOffset);
     }
     const config = this.hls.config;
     const Loader = config.loader;
@@ -24400,7 +24477,7 @@ Schedule: ${scheduleItems.map(seg => segmentToString(seg))}`);
           if (media) {
             const currentTime = timelineType === 'primary' ? media.currentTime : getMappedTime(playingItem, timelineType, c.playingAsset, 'timelinePos', 'currentTime');
             const diff = time - currentTime;
-            const seekToTime = media.currentTime + diff;
+            const seekToTime = (appendInPlace ? currentTime : media.currentTime) + diff;
             if (seekToTime >= 0 && (!assetPlayer || appendInPlace || seekToTime <= assetPlayer.duration)) {
               media.currentTime = seekToTime;
               return;
@@ -24550,12 +24627,7 @@ Schedule: ${scheduleItems.map(seg => segmentToString(seg))}`);
             return getBufferedEnd();
           },
           get currentTime() {
-            var _playingItem$event;
             const timelinePos = c.timelinePos;
-            const playingItem = c.effectivePlayingItem;
-            if (playingItem != null && (_playingItem$event = playingItem.event) != null && _playingItem$event.appendInPlace) {
-              return playingItem.start;
-            }
             return timelinePos > 0 ? timelinePos : 0;
           },
           set currentTime(time) {
@@ -24724,6 +24796,9 @@ Schedule: ${scheduleItems.map(seg => segmentToString(seg))}`);
               const interstitial = queuedPlayer.interstitial;
               this.clearInterstitial(queuedPlayer.interstitial, null);
               interstitial.appendInPlace = false;
+              if (interstitial.appendInPlace) {
+                this.warn(`Could not change append strategy for queued assets ${interstitial}`);
+              }
             }
           });
         }
@@ -24900,7 +24975,9 @@ Schedule: ${scheduleItems.map(seg => segmentToString(seg))}`);
       }
       // Ensure Interstitial is enqueued
       const waitingItem = this.waitingItem;
-      this.setBufferingItem(scheduledItem);
+      if (!this.assetsBuffered(scheduledItem, media)) {
+        this.setBufferingItem(scheduledItem);
+      }
       let player = this.preloadAssets(interstitial, assetListIndex);
       if (!this.eventItemsMatch(scheduledItem, waitingItem || currentItem)) {
         this.waitingItem = scheduledItem;
@@ -25256,6 +25333,16 @@ Schedule: ${scheduleItems.map(seg => segmentToString(seg))}`);
       this.bufferedToItem(playingItem);
     }
   }
+  assetsBuffered(item, media) {
+    const assetList = item.event.assetList;
+    if (assetList.length === 0) {
+      return false;
+    }
+    return !item.event.assetList.some(asset => {
+      const player = this.getAssetPlayer(asset.identifier);
+      return !(player != null && player.bufferedInPlaceToEnd(media));
+    });
+  }
   setBufferingItem(item) {
     const bufferingLast = this.bufferingItem;
     const schedule = this.schedule;
@@ -25351,14 +25438,11 @@ Schedule: ${scheduleItems.map(seg => segmentToString(seg))}`);
     const neverLoaded = assetListLength === 0 && !interstitial.assetListLoader;
     const playOnce = interstitial.cue.once;
     if (neverLoaded) {
-      this.log(`Load interstitial asset ${assetListIndex + 1}/${uri ? 1 : assetListLength} ${interstitial}`);
       const timelineStart = interstitial.timelineStart;
       if (interstitial.appendInPlace) {
         this.flushFrontBuffer(timelineStart + 0.25);
       }
-      if (uri) {
-        return this.createAsset(interstitial, 0, 0, timelineStart, interstitial.duration, uri);
-      }
+      let hlsStartOffset;
       let liveStartPosition = 0;
       if (!this.playingItem && this.primaryLive) {
         liveStartPosition = this.hls.startPosition;
@@ -25366,7 +25450,17 @@ Schedule: ${scheduleItems.map(seg => segmentToString(seg))}`);
           liveStartPosition = this.hls.liveSyncPosition || 0;
         }
       }
-      const assetListLoader = this.assetListLoader.loadAssetList(interstitial, liveStartPosition);
+      if (liveStartPosition && !(interstitial.cue.pre || interstitial.cue.post)) {
+        const startOffset = liveStartPosition - timelineStart;
+        if (startOffset > 0) {
+          hlsStartOffset = Math.round(startOffset * 1000) / 1000;
+        }
+      }
+      this.log(`Load interstitial asset ${assetListIndex + 1}/${uri ? 1 : assetListLength} ${interstitial}${hlsStartOffset ? ` live-start: ${liveStartPosition} start-offset: ${hlsStartOffset}` : ''}`);
+      if (uri) {
+        return this.createAsset(interstitial, 0, 0, timelineStart, interstitial.duration, uri);
+      }
+      const assetListLoader = this.assetListLoader.loadAssetList(interstitial, hlsStartOffset);
       if (assetListLoader) {
         interstitial.assetListLoader = assetListLoader;
       }
@@ -25456,7 +25550,7 @@ Schedule: ${scheduleItems.map(seg => segmentToString(seg))}`);
     const selectedAudio = primary.audioTracks[primary.audioTrack];
     const selectedSubtitle = primary.subtitleTracks[primary.subtitleTrack];
     let startPosition = 0;
-    if (this.primaryLive) {
+    if (this.primaryLive || interstitial.appendInPlace) {
       const timePastStart = this.timelinePos - assetItem.timelineStart;
       if (timePastStart > 1) {
         const duration = assetItem.duration;
@@ -25651,9 +25745,10 @@ Schedule: ${scheduleItems.map(seg => segmentToString(seg))}`);
         player
       });
     }
-
-    // detach media and attach to interstitial player if it does not have another element attached
-    this.bufferAssetPlayer(player, media);
+    if (!player.bufferedInPlaceToEnd(media)) {
+      // detach media and attach to interstitial player if it does not have another element attached
+      this.bufferAssetPlayer(player, media);
+    }
   }
   bufferAssetPlayer(player, media) {
     var _this$schedule$items4, _this$detachedData5;
@@ -25781,6 +25876,7 @@ Schedule: ${scheduleItems.map(seg => segmentToString(seg))}`);
       return;
     }
     const eventStart = interstitial.timelineStart;
+    const previousDuration = interstitial.duration;
     let sumDuration = 0;
     assets.forEach((asset, assetListIndex) => {
       const duration = parseFloat(asset.DURATION);
@@ -25788,6 +25884,7 @@ Schedule: ${scheduleItems.map(seg => segmentToString(seg))}`);
       sumDuration += duration;
     });
     interstitial.duration = sumDuration;
+    this.log(`Loaded asset-list with duration: ${sumDuration} (was: ${previousDuration}) ${interstitial}`);
     const waitingItem = this.waitingItem;
     const waitingForItem = (waitingItem == null ? void 0 : waitingItem.event.identifier) === interstitialId;
 
@@ -25802,6 +25899,15 @@ Schedule: ${scheduleItems.map(seg => segmentToString(seg))}`);
       const scheduleIndex = this.schedule.findEventIndex(interstitialId);
       const item = (_this$schedule$items5 = this.schedule.items) == null ? void 0 : _this$schedule$items5[scheduleIndex];
       if (item) {
+        if (!this.playingItem && this.timelinePos > item.end) {
+          // Abandon if new duration is reduced enough to land playback in primary start
+          const index = this.schedule.findItemIndexAtTime(this.timelinePos);
+          if (index !== scheduleIndex) {
+            interstitial.error = new Error(`Interstitial no longer within playback range ${this.timelinePos} ${interstitial}`);
+            this.primaryFallback(interstitial);
+            return;
+          }
+        }
         this.setBufferingItem(item);
       }
       this.setSchedulePosition(scheduleIndex);
@@ -25869,11 +25975,12 @@ class SubtitleStreamController extends BaseStreamController {
     hls.off(Events.SUBTITLE_FRAG_PROCESSED, this.onSubtitleFragProcessed, this);
     hls.off(Events.BUFFER_FLUSHING, this.onBufferFlushing, this);
   }
-  startLoad(startPosition) {
+  startLoad(startPosition, skipSeekToStartPosition) {
     this.stopLoad();
     this.state = State.IDLE;
     this.setInterval(TICK_INTERVAL$2);
-    this.nextLoadPosition = this.startPosition = this.lastCurrentTime = startPosition;
+    this.nextLoadPosition = this.lastCurrentTime = startPosition + this.timelineOffset;
+    this.startPosition = skipSeekToStartPosition ? -1 : startPosition;
     this.tick();
   }
   onManifestLoading() {
@@ -32016,7 +32123,7 @@ class StreamController extends BaseStreamController {
         startPosition = lastCurrentTime;
       }
       this.state = State.IDLE;
-      this.nextLoadPosition = this.lastCurrentTime = startPosition;
+      this.nextLoadPosition = this.lastCurrentTime = startPosition + this.timelineOffset;
       this.startPosition = skipSeekToStartPosition ? -1 : startPosition;
       this.tick();
     } else {
@@ -32092,7 +32199,7 @@ class StreamController extends BaseStreamController {
     // if start level not parsed yet OR
     // if video not attached AND start fragment already requested OR start frag prefetch not enabled
     // exit loop, as we either need more info (level not parsed) or we need media to be attached to load new fragment
-    if (levelLastLoaded === null || !media && (this.startFragRequested || !hls.config.startFragPrefetch)) {
+    if (levelLastLoaded === null || !media && !this.primaryPrefetch && (this.startFragRequested || !hls.config.startFragPrefetch)) {
       return;
     }
 
@@ -32722,11 +32829,11 @@ class StreamController extends BaseStreamController {
       }
 
       // Offset start position by timeline offset
-      const details = this.getLevelDetails();
-      const configuredTimelineOffset = this.config.timelineOffset;
-      if (configuredTimelineOffset && startPosition) {
-        startPosition += (details == null ? void 0 : details.appliedTimelineOffset) || configuredTimelineOffset;
+      const timelineOffset = this.timelineOffset;
+      if (timelineOffset && startPosition) {
+        startPosition += timelineOffset;
       }
+      const details = this.getLevelDetails();
       const buffered = BufferHelper.getBuffered(media);
       const bufferStart = buffered.length ? buffered.start(0) : 0;
       const delta = bufferStart - startPosition;