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

package/dist/hls.js

@@ -1073,7 +1073,7 @@
       // 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();
@@ -9888,8 +9888,8 @@
         var end = this.loadingParts ? levelDetails.partEnd : levelDetails.fragmentEnd;
         frag = this.getFragmentAtPosition(pos, end, levelDetails);
       }
-      frag = this.filterReplacedPrimary(frag, levelDetails);
-      return this.mapToInitFragWhenRequired(frag);
+      var programFrag = this.filterReplacedPrimary(frag, levelDetails);
+      return this.mapToInitFragWhenRequired(programFrag);
     };
     _proto.isLoopLoading = function isLoopLoading(frag, targetBufferTime) {
       var trackerState = this.fragmentTracker.getState(frag);
@@ -9920,8 +9920,7 @@
       if (!frag) {
         return frag;
       }
-      var 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
         var interstitials = this.hls.interstitialsManager;
         var bufferingItem = interstitials == null ? void 0 : interstitials.bufferingItem;
@@ -9941,7 +9940,10 @@
             }
             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;
+              }
             }
           }
         }
@@ -10117,6 +10119,7 @@
       if (startPosition < sliding) {
         startPosition = -1;
       }
+      var 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
@@ -10140,9 +10143,9 @@
           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;
     };
     _proto.getLoadPosition = function getLoadPosition() {
       var _this$hls;
@@ -10439,6 +10442,28 @@
           state: this.state
         };
       }
+    }, {
+      key: "timelineOffset",
+      get: function get() {
+        var configuredTimelineOffset = this.config.timelineOffset;
+        if (configuredTimelineOffset) {
+          var _this$getLevelDetails;
+          return ((_this$getLevelDetails = this.getLevelDetails()) == null ? void 0 : _this$getLevelDetails.appliedTimelineOffset) || configuredTimelineOffset;
+        }
+        return 0;
+      }
+    }, {
+      key: "primaryPrefetch",
+      get: function get() {
+        if (interstitialsEnabled(this.hls.config)) {
+          var _this$hls$interstitia, _this$hls$interstitia2;
+          var 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;
+      }
     }, {
       key: "state",
       get: function get() {
@@ -10453,6 +10478,9 @@
       }
     }]);
   }(TaskLoop);
+  function interstitialsEnabled(config) {
+    return !!config.interstitialsController && config.enableInterstitialPlayback !== false;
+  }
 
   var ChunkCache = /*#__PURE__*/function () {
     function ChunkCache() {
@@ -16560,7 +16588,7 @@
     return !remuxResult.audio && !remuxResult.video && !remuxResult.text && !remuxResult.id3 && !remuxResult.initSegment;
   }
 
-  var version = "1.6.0-rc.1.0.canary.11079";
+  var 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
@@ -17034,7 +17062,7 @@
       var cc = mainFrag.cc;
       return findNearestWithCC(trackDetails, cc, mainFrag) || trackDetails && findFragWithCC(trackDetails.fragments, cc) || mainFrag;
     };
-    _proto.startLoad = function startLoad(startPosition) {
+    _proto.startLoad = function startLoad(startPosition, skipSeekToStartPosition) {
       if (!this.levels) {
         this.startPosition = startPosition;
         this.state = State.STOPPED;
@@ -17050,7 +17078,8 @@
       } 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();
     };
     _proto.doTick = function doTick() {
@@ -17164,7 +17193,7 @@
       // 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;
       }
       var levelInfo = levels[trackId];
@@ -19381,18 +19410,10 @@
         return type && !((_this16$tracks$type = _this16.tracks[type]) != null && _this16$tracks$type.ended);
       });
       if (allTracksEnding) {
-        this.log("Queueing EOS");
-        this.blockUntilOpen(function () {
-          _this16.sourceBuffers.forEach(function (_ref7) {
-            var type = _ref7[0];
-            if (type !== null) {
-              var track = _this16.tracks[type];
-              if (track) {
-                track.ending = false;
-              }
-            }
-          });
-          if (allowEndOfStream) {
+        if (allowEndOfStream) {
+          this.log("Queueing EOS");
+          this.blockUntilOpen(function () {
+            _this16.tracksEnded();
             var mediaSource = _this16.mediaSource;
             if (!mediaSource || mediaSource.readyState !== 'open') {
               if (mediaSource) {
@@ -19403,11 +19424,26 @@
             _this16.log("Calling mediaSource.endOfStream()");
             // Allow this to throw and be caught by the enqueueing function
             mediaSource.endOfStream();
-          }
-          _this16.hls.trigger(Events.BUFFERED_TO_END, undefined);
-        });
+            _this16.hls.trigger(Events.BUFFERED_TO_END, undefined);
+          });
+        } else {
+          this.tracksEnded();
+          this.hls.trigger(Events.BUFFERED_TO_END, undefined);
+        }
       }
     };
+    _proto.tracksEnded = function tracksEnded() {
+      var _this17 = this;
+      this.sourceBuffers.forEach(function (_ref7) {
+        var type = _ref7[0];
+        if (type !== null) {
+          var track = _this17.tracks[type];
+          if (track) {
+            track.ending = false;
+          }
+        }
+      });
+    };
     _proto.onLevelUpdated = function onLevelUpdated(event, _ref8) {
       var details = _ref8.details;
       if (!details.fragments.length) {
@@ -19417,13 +19453,13 @@
       this.updateDuration();
     };
     _proto.updateDuration = function updateDuration() {
-      var _this17 = this;
+      var _this18 = this;
       var durationAndRange = this.getDurationAndRange();
       if (!durationAndRange) {
         return;
       }
       this.blockUntilOpen(function () {
-        return _this17.updateMediaSource(durationAndRange);
+        return _this18.updateMediaSource(durationAndRange);
       });
     };
     _proto.onError = function onError(event, data) {
@@ -19471,7 +19507,7 @@
       }
     };
     _proto.flushBackBuffer = function flushBackBuffer(currentTime, targetDuration, targetBackBufferPosition) {
-      var _this18 = this;
+      var _this19 = this;
       this.sourceBuffers.forEach(function (_ref9) {
         var type = _ref9[0],
           sb = _ref9[1];
@@ -19479,22 +19515,22 @@
           var buffered = BufferHelper.getBuffered(sb);
           // when target buffer start exceeds actual buffer start
           if (buffered.length > 0 && targetBackBufferPosition > buffered.start(0)) {
-            var _this18$details;
-            _this18.hls.trigger(Events.BACK_BUFFER_REACHED, {
+            var _this19$details;
+            _this19.hls.trigger(Events.BACK_BUFFER_REACHED, {
               bufferEnd: targetBackBufferPosition
             });
 
             // Support for deprecated event:
-            var track = _this18.tracks[type];
-            if ((_this18$details = _this18.details) != null && _this18$details.live) {
-              _this18.hls.trigger(Events.LIVE_BACK_BUFFER_REACHED, {
+            var track = _this19.tracks[type];
+            if ((_this19$details = _this19.details) != null && _this19$details.live) {
+              _this19.hls.trigger(Events.LIVE_BACK_BUFFER_REACHED, {
                 bufferEnd: targetBackBufferPosition
               });
             } else if (track != null && track.ended) {
-              _this18.log("Cannot flush " + type + " back buffer while SourceBuffer is in ended state");
+              _this19.log("Cannot flush " + type + " back buffer while SourceBuffer is in ended state");
               return;
             }
-            _this18.hls.trigger(Events.BUFFER_FLUSHING, {
+            _this19.hls.trigger(Events.BUFFER_FLUSHING, {
               startOffset: 0,
               endOffset: targetBackBufferPosition,
               type: type
@@ -19504,7 +19540,7 @@
       });
     };
     _proto.flushFrontBuffer = function flushFrontBuffer(currentTime, targetDuration, targetFrontBufferPosition) {
-      var _this19 = this;
+      var _this20 = this;
       this.sourceBuffers.forEach(function (_ref10) {
         var type = _ref10[0],
           sb = _ref10[1];
@@ -19521,7 +19557,7 @@
           if (targetFrontBufferPosition > bufferStart || currentTime >= bufferStart && currentTime <= bufferEnd) {
             return;
           }
-          _this19.hls.trigger(Events.BUFFER_FLUSHING, {
+          _this20.hls.trigger(Events.BUFFER_FLUSHING, {
             startOffset: bufferStart,
             endOffset: Infinity,
             type: type
@@ -19616,14 +19652,14 @@
       }
     };
     _proto.bufferCreated = function bufferCreated() {
-      var _this20 = this;
+      var _this21 = this;
       if (this.sourceBufferCount) {
         var tracks = {};
         this.sourceBuffers.forEach(function (_ref12) {
           var type = _ref12[0],
             buffer = _ref12[1];
           if (type) {
-            var track = _this20.tracks[type];
+            var track = _this21.tracks[type];
             tracks[type] = {
               buffer: buffer,
               container: track.container,
@@ -19641,7 +19677,7 @@
         this.log("SourceBuffers created. Running queue: " + this.operationQueue);
         this.sourceBuffers.forEach(function (_ref13) {
           var type = _ref13[0];
-          _this20.executeNext(type);
+          _this21.executeNext(type);
         });
       } else {
         var error = new Error('could not create source buffer for media codec(s)');
@@ -19715,7 +19751,7 @@
       return '';
     };
     _proto.trackSourceBuffer = function trackSourceBuffer(type, track) {
-      var _this21 = this;
+      var _this22 = this;
       var buffer = track.buffer;
       if (!buffer) {
         return;
@@ -19741,7 +19777,7 @@
           // If media was ejected check for a change. Added ranges are redundant with changes on 'updateend' event.
           var removedRanges = event.removedRanges;
           if (removedRanges != null && removedRanges.length) {
-            _this21.hls.trigger(Events.BUFFER_FLUSHED, {
+            _this22.hls.trigger(Events.BUFFER_FLUSHED, {
               type: type
             });
           }
@@ -19841,10 +19877,10 @@
       });
     };
     _proto.isQueued = function isQueued() {
-      var _this22 = this;
+      var _this23 = this;
       return this.sourceBuffers.some(function (_ref15) {
         var type = _ref15[0];
-        return type && !!_this22.currentOp(type);
+        return type && !!_this23.currentOp(type);
       });
     };
     _proto.isPending = function isPending(track) {
@@ -19856,7 +19892,7 @@
     // upon completion, since we already do it here
     ;
     _proto.blockBuffers = function blockBuffers(onUnblocked, bufferNames) {
-      var _this23 = this;
+      var _this24 = this;
       if (bufferNames === void 0) {
         bufferNames = this.sourceBufferTypes;
       }
@@ -19869,33 +19905,33 @@
 
       // logger.debug(`[buffer-controller]: Blocking ${buffers} SourceBuffer`);
       var blockingOperations = bufferNames.map(function (type) {
-        return _this23.appendBlocker(type);
+        return _this24.appendBlocker(type);
       });
       var audioBlocked = bufferNames.length > 1 && !!this.blockedAudioAppend;
       if (audioBlocked) {
         this.unblockAudio();
       }
       Promise.all(blockingOperations).then(function (result) {
-        if (operationQueue !== _this23.operationQueue) {
+        if (operationQueue !== _this24.operationQueue) {
           return;
         }
         // logger.debug(`[buffer-controller]: Blocking operation resolved; unblocking ${buffers} SourceBuffer`);
         onUnblocked();
-        _this23.stepOperationQueue(bufferNames);
+        _this24.stepOperationQueue(bufferNames);
       });
     };
     _proto.stepOperationQueue = function stepOperationQueue(bufferNames) {
-      var _this24 = this;
+      var _this25 = this;
       bufferNames.forEach(function (type) {
-        var _this24$tracks$type;
-        var sb = (_this24$tracks$type = _this24.tracks[type]) == null ? void 0 : _this24$tracks$type.buffer;
+        var _this25$tracks$type;
+        var sb = (_this25$tracks$type = _this25.tracks[type]) == null ? void 0 : _this25$tracks$type.buffer;
         // Only cycle the queue if the SB is not updating. There's a bug in Chrome which sets the SB updating flag to
         // true when changing the MediaSource duration (https://bugs.chromium.org/p/chromium/issues/detail?id=959359&can=2&q=mediasource%20duration)
         // While this is a workaround, it's probably useful to have around
         if (!sb || sb.updating) {
           return;
         }
-        _this24.shiftAndExecuteNext(type);
+        _this25.shiftAndExecuteNext(type);
       });
     };
     _proto.append = function append(operation, type, pending) {
@@ -19964,9 +20000,9 @@
     }, {
       key: "sourceBufferTracks",
       get: function get() {
-        var _this25 = this;
+        var _this26 = this;
         return Object.keys(this.tracks).reduce(function (baseTracks, type) {
-          var track = _this25.tracks[type];
+          var track = _this26.tracks[type];
           baseTracks[type] = {
             id: track.id,
             container: track.container,
@@ -19979,11 +20015,11 @@
     }, {
       key: "bufferedToEnd",
       get: function get() {
-        var _this26 = this;
+        var _this27 = this;
         return this.sourceBufferCount > 0 && !this.sourceBuffers.some(function (_ref16) {
-          var _this26$tracks$type, _this26$tracks$type2;
+          var _this27$tracks$type, _this27$tracks$type2;
           var type = _ref16[0];
-          return type && (!((_this26$tracks$type = _this26.tracks[type]) != null && _this26$tracks$type.ended) || ((_this26$tracks$type2 = _this26.tracks[type]) == null ? void 0 : _this26$tracks$type2.ending));
+          return type && (!((_this27$tracks$type = _this27.tracks[type]) != null && _this27$tracks$type.ended) || ((_this27$tracks$type2 = _this27.tracks[type]) == null ? void 0 : _this27$tracks$type2.ending));
         });
       }
     }, {
@@ -20002,9 +20038,9 @@
     }, {
       key: "pendingTrackCount",
       get: function get() {
-        var _this27 = this;
+        var _this28 = this;
         return Object.keys(this.tracks).reduce(function (acc, type) {
-          return acc + (_this27.isPending(_this27.tracks[type]) ? 1 : 0);
+          return acc + (_this28.isPending(_this28.tracks[type]) ? 1 : 0);
         }, 0);
       }
     }, {
@@ -23112,7 +23148,7 @@
     return (hash >>> 0).toString();
   }
 
-  var ALIGNED_END_THRESHOLD_SECONDS = 0.02;
+  var ALIGNED_END_THRESHOLD_SECONDS = 0.025;
   var TimelineOccupancy = /*#__PURE__*/function (TimelineOccupancy) {
     TimelineOccupancy[TimelineOccupancy["Point"] = 0] = "Point";
     TimelineOccupancy[TimelineOccupancy["Range"] = 1] = "Range";
@@ -23146,6 +23182,7 @@
       this.assetListResponse = null;
       this.resumeAnchor = void 0;
       this.error = void 0;
+      this.resetOnResume = void 0;
       this.base = base;
       this.dateRange = dateRange;
       this.setDateRange(dateRange);
@@ -23217,6 +23254,20 @@
       get: function get() {
         return this.cue.pre ? 0 : this.startTime;
       }
+    }, {
+      key: "startIsAligned",
+      get: function get() {
+        if (this.startTime === 0 || this.snapOptions.out) {
+          return true;
+        }
+        var frag = this.dateRange.tagAnchor;
+        if (frag) {
+          var startTime = this.dateRange.startTime;
+          var snappedStart = getSnapToFragmentTime(startTime, frag);
+          return startTime - snappedStart < 0.1;
+        }
+        return false;
+      }
     }, {
       key: "resumptionOffset",
       get: function get() {
@@ -23240,18 +23291,22 @@
     }, {
       key: "appendInPlace",
       get: function get() {
+        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: function set(value) {
         if (this.appendInPlaceStarted) {
+          this.resetOnResume = !value;
           return;
         }
         this.appendInPlaceDisabled = !value;
@@ -23363,6 +23418,7 @@
       this.hasDetails = false;
       this.mediaAttached = null;
       this._currentTime = void 0;
+      this._bufferedEosTime = void 0;
       this.checkPlayout = function () {
         var interstitial = _this.interstitial;
         var playoutLimit = interstitial.playoutLimit;
@@ -23399,6 +23455,22 @@
       });
     }
     var _proto = HlsAssetPlayer.prototype;
+    _proto.bufferedInPlaceToEnd = function bufferedInPlaceToEnd(media) {
+      var _this$hls;
+      if (!this.interstitial.appendInPlace) {
+        return false;
+      }
+      if ((_this$hls = this.hls) != null && _this$hls.bufferedToEnd) {
+        return true;
+      }
+      if (!media || !this._bufferedEosTime) {
+        return false;
+      }
+      var start = this.timelineOffset;
+      var bufferInfo = BufferHelper.bufferInfo(media, start, 0);
+      var bufferedEnd = this.getAssetTime(bufferInfo.end);
+      return bufferedEnd >= this._bufferedEosTime - 0.02;
+    };
     _proto.getAssetTime = function getAssetTime(time) {
       var timelineOffset = this.timelineOffset;
       var duration = this.duration;
@@ -23408,9 +23480,18 @@
       var media = this.mediaAttached;
       if (media) {
         this._currentTime = media.currentTime;
+        this.bufferSnapShot();
         media.removeEventListener('timeupdate', this.checkPlayout);
       }
     };
+    _proto.bufferSnapShot = function bufferSnapShot() {
+      if (this.mediaAttached) {
+        var _this$hls2;
+        if ((_this$hls2 = this.hls) != null && _this$hls2.bufferedToEnd) {
+          this._bufferedEosTime = this.bufferedEnd;
+        }
+      }
+    };
     _proto.destroy = function destroy() {
       this.removeMediaListeners();
       this.hls.destroy();
@@ -23434,6 +23515,7 @@
       this.hls.pauseBuffering();
     };
     _proto.transferMedia = function transferMedia() {
+      this.bufferSnapShot();
       return this.hls.transferMedia();
     };
     _proto.on = function on(event, listener, context) {
@@ -23446,14 +23528,14 @@
       this.hls.off(event, listener);
     };
     _proto.toString = function toString() {
-      var _this$hls, _this$interstitial;
-      return "HlsAssetPlayer: " + eventAssetToString(this.assetItem) + " " + ((_this$hls = this.hls) == null ? void 0 : _this$hls.sessionId) + " " + ((_this$interstitial = this.interstitial) != null && _this$interstitial.appendInPlace ? 'append-in-place' : '');
+      var _this$hls3, _this$interstitial;
+      return "HlsAssetPlayer: " + eventAssetToString(this.assetItem) + " " + ((_this$hls3 = this.hls) == null ? void 0 : _this$hls3.sessionId) + " " + ((_this$interstitial = this.interstitial) != null && _this$interstitial.appendInPlace ? 'append-in-place' : '');
     };
     return _createClass(HlsAssetPlayer, [{
       key: "destroyed",
       get: function get() {
-        var _this$hls2;
-        return !((_this$hls2 = this.hls) != null && _this$hls2.userConfig);
+        var _this$hls4;
+        return !((_this$hls4 = this.hls) != null && _this$hls4.userConfig);
       }
     }, {
       key: "assetId",
@@ -23468,14 +23550,17 @@
     }, {
       key: "media",
       get: function get() {
-        var _this$hls3;
-        return ((_this$hls3 = this.hls) == null ? void 0 : _this$hls3.media) || null;
+        var _this$hls5;
+        return ((_this$hls5 = this.hls) == null ? void 0 : _this$hls5.media) || null;
       }
     }, {
       key: "bufferedEnd",
       get: function get() {
         var media = this.media || this.mediaAttached;
         if (!media) {
+          if (this._bufferedEosTime) {
+            return this._bufferedEosTime;
+          }
           return this.currentTime;
         }
         var bufferInfo = BufferHelper.bufferInfo(media, media.currentTime, 0.001);
@@ -23516,8 +23601,8 @@
     }, {
       key: "timelineOffset",
       get: function get() {
-        var _this$hls4;
-        return ((_this$hls4 = this.hls) == null ? void 0 : _this$hls4.config.timelineOffset) || 0;
+        var _this$hls6;
+        return ((_this$hls6 = this.hls) == null ? void 0 : _this$hls6.config.timelineOffset) || 0;
       },
       set: function set(value) {
         var timelineOffset = this.timelineOffset;
@@ -23971,6 +24056,9 @@
           var timeBetween = interstitialEvents[i + 1].startTime - interstitialEvents[i].resumeTime;
           if (timeBetween < ABUTTING_THRESHOLD_SECONDS) {
             interstitialEvents[i + 1].appendInPlace = false;
+            if (interstitialEvents[i + 1].appendInPlace) {
+              _this3.warn("Could not change append strategy for abutting event " + interstitial);
+            }
           }
         }
         // Update cumulativeDuration for next abutting interstitial with the same start date
@@ -23995,19 +24083,18 @@
         var details = mediaSelection[playlistType].details;
         var playlistEnd = details.edge;
         if (resumeTime > playlistEnd) {
-          if (playlists.length > 1) {
-            _this4.log("\"" + interstitial.identifier + "\" resumption " + resumeTime + " past " + playlistType + " playlist end " + playlistEnd);
-            return true;
-          }
+          // Live playback - resumption segments are not yet available
+          _this4.log("\"" + interstitial.identifier + "\" resumption " + resumeTime + " past " + playlistType + " playlist end " + playlistEnd);
+          // Assume alignment is possible (or reset can take place)
           return false;
         }
         var startFragment = findFragmentByPTS(null, details.fragments, resumeTime);
         if (!startFragment) {
-          _this4.log("\"" + interstitial.identifier + "\" resumption " + resumeTime + " does not align with any fragments in " + playlistType + " playlist");
+          _this4.log("\"" + interstitial.identifier + "\" resumption " + resumeTime + " does not align with any fragments in " + playlistType + " playlist (" + details.fragStart + "-" + details.fragmentEnd + ")");
           return true;
         }
-        var endAllowance = playlistType === 'audio' ? 0.175 : 0;
-        var alignedWithSegment = Math.abs(startFragment.start - resumeTime) < ALIGNED_END_THRESHOLD_SECONDS || Math.abs(startFragment.end - resumeTime) < ALIGNED_END_THRESHOLD_SECONDS + endAllowance;
+        var allowance = playlistType === 'audio' ? 0.175 : 0;
+        var alignedWithSegment = Math.abs(startFragment.start - resumeTime) < ALIGNED_END_THRESHOLD_SECONDS + allowance || Math.abs(startFragment.end - resumeTime) < ALIGNED_END_THRESHOLD_SECONDS + allowance;
         if (!alignedWithSegment) {
           _this4.log("\"" + interstitial.identifier + "\" resumption " + resumeTime + " not aligned with " + playlistType + " fragment bounds (" + startFragment.start + "-" + startFragment.end + " sn: " + startFragment.sn + " cc: " + startFragment.cc + ")");
           return true;
@@ -24084,7 +24171,7 @@
       // @ts-ignore
       this.hls = null;
     };
-    _proto.loadAssetList = function loadAssetList(interstitial, liveStartPosition) {
+    _proto.loadAssetList = function loadAssetList(interstitial, hlsStartOffset) {
       var _this = this;
       var assetListUrl = interstitial.assetListUrl;
       var url;
@@ -24095,11 +24182,8 @@
         this.hls.trigger(Events.ERROR, errorData);
         return;
       }
-      if (liveStartPosition && !(interstitial.cue.pre || interstitial.cue.post) && url.protocol !== 'data:') {
-        var 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);
       }
       var config = this.hls.config;
       var Loader = config.loader;
@@ -24620,6 +24704,9 @@
                 var interstitial = queuedPlayer.interstitial;
                 _this2.clearInterstitial(queuedPlayer.interstitial, null);
                 interstitial.appendInPlace = false;
+                if (interstitial.appendInPlace) {
+                  _this2.warn("Could not change append strategy for queued assets " + interstitial);
+                }
               }
             });
           }
@@ -24797,7 +24884,9 @@
         }
         // Ensure Interstitial is enqueued
         var waitingItem = this.waitingItem;
-        this.setBufferingItem(scheduledItem);
+        if (!this.assetsBuffered(scheduledItem, media)) {
+          this.setBufferingItem(scheduledItem);
+        }
         var player = this.preloadAssets(interstitial, assetListIndex);
         if (!this.eventItemsMatch(scheduledItem, waitingItem || currentItem)) {
           this.waitingItem = scheduledItem;
@@ -25148,8 +25237,19 @@
         this.bufferedToItem(playingItem);
       }
     };
-    _proto.setBufferingItem = function setBufferingItem(item) {
+    _proto.assetsBuffered = function assetsBuffered(item, media) {
       var _this4 = this;
+      var assetList = item.event.assetList;
+      if (assetList.length === 0) {
+        return false;
+      }
+      return !item.event.assetList.some(function (asset) {
+        var player = _this4.getAssetPlayer(asset.identifier);
+        return !(player != null && player.bufferedInPlaceToEnd(media));
+      });
+    };
+    _proto.setBufferingItem = function setBufferingItem(item) {
+      var _this5 = this;
       var bufferingLast = this.bufferingItem;
       var schedule = this.schedule;
       if (!this.itemsMatch(item, bufferingLast)) {
@@ -25168,7 +25268,7 @@
           if (isInterstitial) {
             // primary fragment loading will exit early in base-stream-controller while `bufferingItem` is set to an Interstitial block
             item.event.assetList.forEach(function (asset) {
-              var player = _this4.getAssetPlayer(asset.identifier);
+              var player = _this5.getAssetPlayer(asset.identifier);
               if (player) {
                 player.resumeBuffering();
               }
@@ -25247,14 +25347,11 @@
       var neverLoaded = assetListLength === 0 && !interstitial.assetListLoader;
       var playOnce = interstitial.cue.once;
       if (neverLoaded) {
-        this.log("Load interstitial asset " + (assetListIndex + 1) + "/" + (uri ? 1 : assetListLength) + " " + interstitial);
         var timelineStart = interstitial.timelineStart;
         if (interstitial.appendInPlace) {
           this.flushFrontBuffer(timelineStart + 0.25);
         }
-        if (uri) {
-          return this.createAsset(interstitial, 0, 0, timelineStart, interstitial.duration, uri);
-        }
+        var hlsStartOffset;
         var liveStartPosition = 0;
         if (!this.playingItem && this.primaryLive) {
           liveStartPosition = this.hls.startPosition;
@@ -25262,7 +25359,17 @@
             liveStartPosition = this.hls.liveSyncPosition || 0;
           }
         }
-        var assetListLoader = this.assetListLoader.loadAssetList(interstitial, liveStartPosition);
+        if (liveStartPosition && !(interstitial.cue.pre || interstitial.cue.post)) {
+          var 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);
+        }
+        var assetListLoader = this.assetListLoader.loadAssetList(interstitial, hlsStartOffset);
         if (assetListLoader) {
           interstitial.assetListLoader = assetListLoader;
         }
@@ -25280,7 +25387,7 @@
       return null;
     };
     _proto.flushFrontBuffer = function flushFrontBuffer(startOffset) {
-      var _this5 = this;
+      var _this6 = this;
       // Force queued flushing of all buffers
       var requiredTracks = this.requiredTracks;
       if (!requiredTracks) {
@@ -25288,7 +25395,7 @@
       }
       var sourceBufferNames = Object.keys(requiredTracks);
       sourceBufferNames.forEach(function (type) {
-        _this5.hls.trigger(Events.BUFFER_FLUSHING, {
+        _this6.hls.trigger(Events.BUFFER_FLUSHING, {
           startOffset: startOffset,
           endOffset: Infinity,
           type: type
@@ -25335,7 +25442,7 @@
       return this.createAssetPlayer(interstitial, assetItem, assetListIndex);
     };
     _proto.createAssetPlayer = function createAssetPlayer(interstitial, assetItem, assetListIndex) {
-      var _this6 = this;
+      var _this7 = this;
       this.log("create HLSAssetPlayer for " + eventAssetToString(assetItem));
       var primary = this.hls;
       var userConfig = primary.userConfig;
@@ -25353,7 +25460,7 @@
       var selectedAudio = primary.audioTracks[primary.audioTrack];
       var selectedSubtitle = primary.subtitleTracks[primary.subtitleTrack];
       var startPosition = 0;
-      if (this.primaryLive) {
+      if (this.primaryLive || interstitial.appendInPlace) {
         var timePastStart = this.timelinePos - assetItem.timelineStart;
         if (timePastStart > 1) {
           var duration = assetItem.duration;
@@ -25402,17 +25509,17 @@
             details: ErrorDetails.INTERSTITIAL_ASSET_ITEM_ERROR,
             error: error
           };
-          _this6.handleAssetItemError(errorData, interstitial, _this6.schedule.findEventIndex(interstitial.identifier), assetListIndex, error.message);
+          _this7.handleAssetItemError(errorData, interstitial, _this7.schedule.findEventIndex(interstitial.identifier), assetListIndex, error.message);
           return;
         }
         // Get time at end of last fragment
         var duration = details.edge - details.fragmentStart;
         var currentAssetDuration = assetItem.duration;
         if (currentAssetDuration === null || duration > currentAssetDuration) {
-          _this6.log("Interstitial asset \"" + assetId + "\" duration change " + currentAssetDuration + " > " + duration);
+          _this7.log("Interstitial asset \"" + assetId + "\" duration change " + currentAssetDuration + " > " + duration);
           assetItem.duration = duration;
           // Update schedule with new event and asset duration
-          _this6.updateSchedule();
+          _this7.updateSchedule();
         }
       };
       player.on(Events.LEVEL_UPDATED, function (event, _ref) {
@@ -25424,39 +25531,39 @@
         return updateAssetPlayerDetails(details);
       });
       var _onBufferCodecs = function onBufferCodecs(event, data) {
-        var inQueuPlayer = _this6.getAssetPlayer(assetId);
+        var inQueuPlayer = _this7.getAssetPlayer(assetId);
         if (inQueuPlayer && data.tracks) {
           inQueuPlayer.off(Events.BUFFER_CODECS, _onBufferCodecs);
           inQueuPlayer.tracks = data.tracks;
-          var media = _this6.primaryMedia;
-          if (_this6.bufferingAsset === inQueuPlayer.assetItem && media && !inQueuPlayer.media) {
-            _this6.bufferAssetPlayer(inQueuPlayer, media);
+          var media = _this7.primaryMedia;
+          if (_this7.bufferingAsset === inQueuPlayer.assetItem && media && !inQueuPlayer.media) {
+            _this7.bufferAssetPlayer(inQueuPlayer, media);
           }
         }
       };
       player.on(Events.BUFFER_CODECS, _onBufferCodecs);
       var _bufferedToEnd = function bufferedToEnd(name) {
-        var _this6$schedule$items;
-        var inQueuPlayer = _this6.getAssetPlayer(assetId);
-        _this6.log("buffered to end of asset " + inQueuPlayer);
+        var _this7$schedule$items;
+        var inQueuPlayer = _this7.getAssetPlayer(assetId);
+        _this7.log("buffered to end of asset " + inQueuPlayer);
         if (!inQueuPlayer) {
           return;
         }
         inQueuPlayer.off(Events.BUFFERED_TO_END, _bufferedToEnd);
 
         // Preload at end of asset
-        var scheduleIndex = _this6.schedule.findEventIndex(interstitial.identifier);
+        var scheduleIndex = _this7.schedule.findEventIndex(interstitial.identifier);
         var assetListIndex = interstitial.findAssetIndex(assetItem);
         var nextAssetIndex = assetListIndex + 1;
-        var item = (_this6$schedule$items = _this6.schedule.items) == null ? void 0 : _this6$schedule$items[scheduleIndex];
-        if (_this6.isInterstitial(item)) {
+        var item = (_this7$schedule$items = _this7.schedule.items) == null ? void 0 : _this7$schedule$items[scheduleIndex];
+        if (_this7.isInterstitial(item)) {
           if (assetListIndex !== -1 && !interstitial.isAssetPastPlayoutLimit(nextAssetIndex) && !interstitial.assetList[nextAssetIndex].error) {
-            _this6.bufferedToItem(item, assetListIndex + 1);
+            _this7.bufferedToItem(item, assetListIndex + 1);
           } else {
-            var _this6$schedule$items2;
-            var nextItem = (_this6$schedule$items2 = _this6.schedule.items) == null ? void 0 : _this6$schedule$items2[scheduleIndex + 1];
+            var _this7$schedule$items2;
+            var nextItem = (_this7$schedule$items2 = _this7.schedule.items) == null ? void 0 : _this7$schedule$items2[scheduleIndex + 1];
             if (nextItem) {
-              _this6.bufferedToItem(nextItem);
+              _this7.bufferedToItem(nextItem);
             }
           }
         }
@@ -25464,22 +25571,22 @@
       player.on(Events.BUFFERED_TO_END, _bufferedToEnd);
       var endedWithAssetIndex = function endedWithAssetIndex(assetIndex) {
         return function () {
-          var inQueuPlayer = _this6.getAssetPlayer(assetId);
+          var inQueuPlayer = _this7.getAssetPlayer(assetId);
           if (!inQueuPlayer) {
             return;
           }
-          _this6.shouldPlay = true;
-          var scheduleIndex = _this6.schedule.findEventIndex(interstitial.identifier);
-          _this6.advanceAfterAssetEnded(interstitial, scheduleIndex, assetIndex);
+          _this7.shouldPlay = true;
+          var scheduleIndex = _this7.schedule.findEventIndex(interstitial.identifier);
+          _this7.advanceAfterAssetEnded(interstitial, scheduleIndex, assetIndex);
         };
       };
       player.once(Events.MEDIA_ENDED, endedWithAssetIndex(assetListIndex));
       player.once(Events.PLAYOUT_LIMIT_REACHED, endedWithAssetIndex(Infinity));
       player.on(Events.ERROR, function (event, data) {
-        _this6.handleAssetItemError(data, interstitial, _this6.schedule.findEventIndex(interstitial.identifier), assetListIndex, "Asset player error " + data.error + " " + interstitial);
+        _this7.handleAssetItemError(data, interstitial, _this7.schedule.findEventIndex(interstitial.identifier), assetListIndex, "Asset player error " + data.error + " " + interstitial);
       });
       player.on(Events.DESTROYING, function () {
-        var inQueuPlayer = _this6.getAssetPlayer(assetId);
+        var inQueuPlayer = _this7.getAssetPlayer(assetId);
         if (!inQueuPlayer) {
           return;
         }
@@ -25490,7 +25597,7 @@
           details: ErrorDetails.INTERSTITIAL_ASSET_ITEM_ERROR,
           error: error
         };
-        _this6.handleAssetItemError(errorData, interstitial, _this6.schedule.findEventIndex(interstitial.identifier), assetListIndex, error.message);
+        _this7.handleAssetItemError(errorData, interstitial, _this7.schedule.findEventIndex(interstitial.identifier), assetListIndex, error.message);
       });
       this.hls.trigger(Events.INTERSTITIAL_ASSET_PLAYER_CREATED, {
         asset: assetItem,
@@ -25501,9 +25608,9 @@
       return player;
     };
     _proto.clearInterstitial = function clearInterstitial(interstitial, toSegment) {
-      var _this7 = this;
+      var _this8 = this;
       interstitial.assetList.forEach(function (asset) {
-        _this7.clearAssetPlayer(asset.identifier, toSegment);
+        _this8.clearAssetPlayer(asset.identifier, toSegment);
       });
       // Remove asset list and resolved duration
       interstitial.reset();
@@ -25549,9 +25656,10 @@
           player: 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);
+      }
     };
     _proto.bufferAssetPlayer = function bufferAssetPlayer(player, media) {
       var _this$schedule$items2, _this$detachedData4;
@@ -25671,7 +25779,7 @@
     // Asset List loading
     ;
     _proto.onAssetListLoaded = function onAssetListLoaded(event, data) {
-      var _this8 = this,
+      var _this9 = this,
         _this$bufferingItem;
       var interstitial = data.event;
       var interstitialId = interstitial.identifier;
@@ -25681,13 +25789,15 @@
         return;
       }
       var eventStart = interstitial.timelineStart;
+      var previousDuration = interstitial.duration;
       var sumDuration = 0;
       assets.forEach(function (asset, assetListIndex) {
         var duration = parseFloat(asset.DURATION);
-        _this8.createAsset(interstitial, assetListIndex, sumDuration, eventStart + sumDuration, duration, asset.URI);
+        _this9.createAsset(interstitial, assetListIndex, sumDuration, eventStart + sumDuration, duration, asset.URI);
         sumDuration += duration;
       });
       interstitial.duration = sumDuration;
+      this.log("Loaded asset-list with duration: " + sumDuration + " (was: " + previousDuration + ") " + interstitial);
       var waitingItem = this.waitingItem;
       var waitingForItem = (waitingItem == null ? void 0 : waitingItem.event.identifier) === interstitialId;
 
@@ -25702,6 +25812,15 @@
         var scheduleIndex = this.schedule.findEventIndex(interstitialId);
         var item = (_this$schedule$items3 = this.schedule.items) == null ? void 0 : _this$schedule$items3[scheduleIndex];
         if (item) {
+          if (!this.playingItem && this.timelinePos > item.end) {
+            // Abandon if new duration is reduced enough to land playback in primary start
+            var 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);
@@ -25809,7 +25928,7 @@
               if (media) {
                 var currentTime = timelineType === 'primary' ? media.currentTime : getMappedTime(playingItem, timelineType, c.playingAsset, 'timelinePos', 'currentTime');
                 var diff = time - currentTime;
-                var seekToTime = media.currentTime + diff;
+                var seekToTime = (appendInPlace ? currentTime : media.currentTime) + diff;
                 if (seekToTime >= 0 && (!assetPlayer || appendInPlace || seekToTime <= assetPlayer.duration)) {
                   media.currentTime = seekToTime;
                   return;
@@ -25961,12 +26080,7 @@
                 return getBufferedEnd();
               },
               get currentTime() {
-                var _playingItem$event;
                 var timelinePos = c.timelinePos;
-                var 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) {
@@ -26134,11 +26248,12 @@
       hls.off(Events.SUBTITLE_FRAG_PROCESSED, this.onSubtitleFragProcessed, this);
       hls.off(Events.BUFFER_FLUSHING, this.onBufferFlushing, this);
     };
-    _proto.startLoad = function startLoad(startPosition) {
+    _proto.startLoad = function 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();
     };
     _proto.onManifestLoading = function onManifestLoading() {
@@ -32946,7 +33061,7 @@
           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 {
@@ -33016,7 +33131,7 @@
       // 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;
       }
 
@@ -33625,11 +33740,11 @@
         }
 
         // Offset start position by timeline offset
-        var details = this.getLevelDetails();
-        var configuredTimelineOffset = this.config.timelineOffset;
-        if (configuredTimelineOffset && startPosition) {
-          startPosition += (details == null ? void 0 : details.appliedTimelineOffset) || configuredTimelineOffset;
+        var timelineOffset = this.timelineOffset;
+        if (timelineOffset && startPosition) {
+          startPosition += timelineOffset;
         }
+        var details = this.getLevelDetails();
         var buffered = BufferHelper.getBuffered(media);
         var bufferStart = buffered.length ? buffered.start(0) : 0;
         var delta = bufferStart - startPosition;