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

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-beta.4.0.canary.11044");
+        newLogger.log("Debug logs enabled for \"" + context + "\" in hls.js version " + "1.6.0-beta.4.0.canary.11045");
       } catch (e) {
         /* log fn threw an exception. All logger methods are no-ops. */
         return createLogger();
@@ -8716,15 +8716,12 @@
   function reassignFragmentLevelIndexes(levels) {
     levels.forEach(function (level, index) {
       var _level$details;
-      var fragments = (_level$details = level.details) == null ? void 0 : _level$details.fragments;
-      if (fragments) {
-        fragments.forEach(function (fragment) {
-          fragment.level = index;
-          if (fragment.initSegment) {
-            fragment.initSegment.level = index;
-          }
-        });
-      }
+      (_level$details = level.details) == null ? void 0 : _level$details.fragments.forEach(function (fragment) {
+        fragment.level = index;
+        if (fragment.initSegment) {
+          fragment.initSegment.level = index;
+        }
+      });
     });
   }
 
@@ -9116,6 +9113,7 @@
       this.media = this.mediaBuffer = null;
       this.loopSn = undefined;
       if (transferringMedia) {
+        this.resetLoadingState();
         this.resetTransmuxer();
         return;
       }
@@ -9158,42 +9156,6 @@
       _TaskLoop.prototype.onHandlerDestroyed.call(this);
     };
     _proto.loadFragment = function loadFragment(frag, level, targetBufferTime) {
-      var config = this.hls.config;
-      if (config.interstitialsController && config.enableInterstitialPlayback !== false && 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;
-        if (bufferingItem) {
-          var 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 {
-            var _level$details;
-            // Limit fragment loading to media in schedule item
-            if (frag.end <= bufferingItem.start && ((_level$details = level.details) == null ? void 0 : _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
-        var playerQueue = interstitials == null ? void 0 : interstitials.playerQueue;
-        if (playerQueue) {
-          for (var i = playerQueue.length; i--;) {
-            var interstitial = playerQueue[i].interstitial;
-            if (interstitial.appendInPlace && frag.start >= interstitial.startTime && frag.end <= interstitial.resumeTime) {
-              return;
-            }
-          }
-        }
-      }
       this.startFragRequested = true;
       this._loadFragForPlayback(frag, level, targetBufferTime);
     };
@@ -9552,9 +9514,9 @@
     _proto.doFragPartsLoad = function doFragPartsLoad(frag, fromPart, level, progressCallback) {
       var _this6 = this;
       return new Promise(function (resolve, reject) {
-        var _level$details2;
+        var _level$details;
         var partsLoaded = [];
-        var initialPartList = (_level$details2 = level.details) == null ? void 0 : _level$details2.partList;
+        var initialPartList = (_level$details = level.details) == null ? void 0 : _level$details.partList;
         var _loadPart = function loadPart(part) {
           _this6.fragmentLoader.loadPart(frag, part, progressCallback).then(function (partLoadedData) {
             partsLoaded[part.index] = partLoadedData;
@@ -9820,6 +9782,7 @@
         var end = this.loadingParts ? levelDetails.partEnd : levelDetails.fragmentEnd;
         frag = this.getFragmentAtPosition(pos, end, levelDetails);
       }
+      frag = this.filterReplacedPrimary(frag, levelDetails);
       return this.mapToInitFragWhenRequired(frag);
     };
     _proto.isLoopLoading = function isLoopLoading(frag, targetBufferTime) {
@@ -9847,6 +9810,48 @@
       this.loopSn = undefined;
       return nextFragment;
     };
+    _proto.filterReplacedPrimary = function filterReplacedPrimary(frag, details) {
+      if (!frag) {
+        return frag;
+      }
+      var config = this.hls.config;
+      if (config.interstitialsController && config.enableInterstitialPlayback !== false && 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;
+        if (bufferingItem) {
+          var 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 == null ? void 0 : 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
+        var playerQueue = interstitials == null ? void 0 : interstitials.playerQueue;
+        if (playerQueue) {
+          for (var i = playerQueue.length; i--;) {
+            var interstitial = playerQueue[i].interstitial;
+            if (interstitial.appendInPlace && frag.start >= interstitial.startTime && frag.end <= interstitial.resumeTime) {
+              return null;
+            }
+          }
+        }
+      }
+      return frag;
+    };
     _proto.mapToInitFragWhenRequired = function mapToInitFragWhenRequired(frag) {
       // If an initSegment is present, it must be buffered first
       if (frag != null && frag.initSegment && !(frag != null && frag.initSegment.data) && !this.bitrateTest) {
@@ -16443,7 +16448,7 @@
     return !remuxResult.audio && !remuxResult.video && !remuxResult.text && !remuxResult.id3 && !remuxResult.initSegment;
   }
 
-  var version = "1.6.0-beta.4.0.canary.11044";
+  var version = "1.6.0-beta.4.0.canary.11045";
 
   // ensure the worker ends up in the bundle
   // If the worker should not be included this gets aliased to empty.js
@@ -18436,15 +18441,14 @@
         if (!media || !mediaSource) {
           return;
         }
+        // once received, don't listen anymore to sourceopen event
+        mediaSource.removeEventListener('sourceopen', _this2._onMediaSourceOpen);
         media.removeEventListener('emptied', _this2._onMediaEmptied);
         _this2.updateDuration();
         _this2.hls.trigger(Events.MEDIA_ATTACHED, {
           media: media,
           mediaSource: mediaSource
         });
-
-        // once received, don't listen anymore to sourceopen event
-        mediaSource.removeEventListener('sourceopen', _this2._onMediaSourceOpen);
         if (_this2.mediaSource !== null) {
           _this2.checkPendingTracks();
         }
@@ -23213,6 +23217,7 @@
       this.tracks = null;
       this.hasDetails = false;
       this.mediaAttached = null;
+      this._currentTime = void 0;
       this.checkPlayout = function () {
         var interstitial = _this.interstitial;
         var playoutLimit = interstitial.playoutLimit;
@@ -23257,6 +23262,7 @@
     _proto.removeMediaListeners = function removeMediaListeners() {
       var media = this.mediaAttached;
       if (media) {
+        this._currentTime = media.currentTime;
         media.removeEventListener('timeupdate', this.checkPlayout);
       }
     };
@@ -23273,6 +23279,7 @@
     };
     _proto.detachMedia = function detachMedia() {
       this.removeMediaListeners();
+      this.mediaAttached = null;
       this.hls.detachMedia();
     };
     _proto.resumeBuffering = function resumeBuffering() {
@@ -23294,13 +23301,14 @@
       this.hls.off(event, listener);
     };
     _proto.toString = function toString() {
-      return "HlsAssetPlayer: " + eventAssetToString(this.assetItem) + " " + this.hls.sessionId + " " + (this.interstitial.appendInPlace ? 'append-in-place' : '');
+      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' : '');
     };
     return _createClass(HlsAssetPlayer, [{
       key: "destroyed",
       get: function get() {
-        var _this$hls;
-        return !((_this$hls = this.hls) != null && _this$hls.userConfig);
+        var _this$hls2;
+        return !((_this$hls2 = this.hls) != null && _this$hls2.userConfig);
       }
     }, {
       key: "assetId",
@@ -23315,15 +23323,15 @@
     }, {
       key: "media",
       get: function get() {
-        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;
       }
     }, {
       key: "bufferedEnd",
       get: function get() {
         var media = this.media || this.mediaAttached;
         if (!media) {
-          return 0;
+          return this.currentTime;
         }
         var bufferInfo = BufferHelper.bufferInfo(media, media.currentTime, 0.001);
         return this.getAssetTime(bufferInfo.end);
@@ -23333,7 +23341,7 @@
       get: function get() {
         var media = this.media || this.mediaAttached;
         if (!media) {
-          return 0;
+          return this._currentTime || 0;
         }
         return this.getAssetTime(media.currentTime);
       }
@@ -23363,8 +23371,8 @@
     }, {
       key: "timelineOffset",
       get: function get() {
-        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: function set(value) {
         var timelineOffset = this.timelineOffset;
@@ -23521,14 +23529,14 @@
       }
       return 0;
     };
-    _proto.parseInterstitialDateRanges = function parseInterstitialDateRanges(mediaSelection) {
+    _proto.parseInterstitialDateRanges = function parseInterstitialDateRanges(mediaSelection, enableAppendInPlace) {
       var _this2 = this;
       var details = mediaSelection.main.details;
       var dateRanges = details.dateRanges;
       var previousInterstitialEvents = this.events;
       var interstitialEvents = this.parseDateRanges(dateRanges, {
         url: details.url
-      });
+      }, enableAppendInPlace);
       var ids = Object.keys(dateRanges);
       var removedInterstitials = previousInterstitialEvents ? previousInterstitialEvents.filter(function (event) {
         return !ids.includes(event.identifier);
@@ -23589,7 +23597,7 @@
         }
       }
     };
-    _proto.parseDateRanges = function parseDateRanges(dateRanges, baseData) {
+    _proto.parseDateRanges = function parseDateRanges(dateRanges, baseData, enableAppendInPlace) {
       var interstitialEvents = [];
       var ids = Object.keys(dateRanges);
       for (var i = 0; i < ids.length; i++) {
@@ -23604,6 +23612,9 @@
           } else {
             interstitial = new InterstitialEvent(dateRange, baseData);
             this.eventMap[id] = interstitial;
+            if (enableAppendInPlace === false) {
+              interstitial.appendInPlace = enableAppendInPlace;
+            }
           }
           interstitialEvents.push(interstitial);
         }
@@ -23810,13 +23821,11 @@
             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 (var j = i - 1; i--;) {
-            var timeBetween = interstitialEvents[j + 1].startTime - interstitialEvents[j].resumeTime;
-            if (timeBetween < ABUTTING_THRESHOLD_SECONDS) {
-              interstitialEvents[j].appendInPlace = false;
-            }
+          var 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
@@ -24176,11 +24185,6 @@
         });
         var interstitialsUpdated = !!(interstitialEvents.length || removedIds.length);
         if (interstitialsUpdated) {
-          if (_this.hls.config.interstitialAppendInPlace === false) {
-            interstitialEvents.forEach(function (event) {
-              return event.appendInPlace = false;
-            });
-          }
           _this.log("INTERSTITIALS_UPDATED (" + interstitialEvents.length + "): " + interstitialEvents + "\nSchedule: " + scheduleItems.map(function (seg) {
             return segmentToString(seg);
           }));
@@ -24314,14 +24318,12 @@
       this.pauseBuffering();
     };
     _proto.resumeBuffering = function resumeBuffering() {
-      this.playerQueue.forEach(function (player) {
-        return player.resumeBuffering();
-      });
+      var _this$getBufferingPla;
+      (_this$getBufferingPla = this.getBufferingPlayer()) == null ? void 0 : _this$getBufferingPla.resumeBuffering();
     };
     _proto.pauseBuffering = function pauseBuffering() {
-      this.playerQueue.forEach(function (player) {
-        return player.pauseBuffering();
-      });
+      var _this$getBufferingPla2;
+      (_this$getBufferingPla2 = this.getBufferingPlayer()) == null ? void 0 : _this$getBufferingPla2.pauseBuffering();
     };
     _proto.destroy = function destroy() {
       this.unregisterListeners();
@@ -24431,33 +24433,51 @@
       }
     };
     _proto.transferMediaTo = function transferMediaTo(player, media) {
-      var _this$detachedData, _attachMediaSourceDat;
+      var _this$detachedData,
+        _this2 = this,
+        _attachMediaSourceDat;
+      if (player.media === media) {
+        return;
+      }
       var attachMediaSourceData = null;
       var primaryPlayer = this.hls;
       var isAssetPlayer = player !== primaryPlayer;
       var appendInPlace = isAssetPlayer && player.interstitial.appendInPlace;
       var detachedMediaSource = (_this$detachedData = this.detachedData) == null ? void 0 : _this$detachedData.mediaSource;
       var logFromSource;
-      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) {
         var 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') + "\nMediaSource " + 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
+          var playerQueue = this.playerQueue;
+          if (playerQueue.length > 1) {
+            playerQueue.forEach(function (queuedPlayer) {
+              if (isAssetPlayer && queuedPlayer.interstitial.appendInPlace !== appendInPlace) {
+                var interstitial = queuedPlayer.interstitial;
+                _this2.clearInterstitial(queuedPlayer.interstitial, null);
+                interstitial.appendInPlace = false;
+              }
+            });
+          }
           this.hls.detachMedia();
           this.detachedData = {
             media: media
@@ -24466,7 +24486,7 @@
       }
       var transferring = attachMediaSourceData && 'mediaSource' in attachMediaSourceData && ((_attachMediaSourceDat = attachMediaSourceData.mediaSource) == null ? void 0 : _attachMediaSourceDat.readyState) !== 'closed';
       var dataToAttach = transferring && attachMediaSourceData ? attachMediaSourceData : media;
-      this.log((transferring ? 'transfering MediaSource' : 'attaching media') + " to " + (isAssetPlayer ? player : 'Primary'));
+      this.log((transferring ? 'transfering MediaSource' : 'attaching media') + " to " + (isAssetPlayer ? player : 'Primary') + " from " + logFromSource);
       if (dataToAttach === attachMediaSourceData) {
         var isAssetAtEndOfSchedule = isAssetPlayer && player.assetId === this.schedule.assetIdAtEnd;
         // Prevent asset players from marking EoS on transferred MediaSource
@@ -24563,6 +24583,7 @@
         var assetId = playingAsset == null ? void 0 : playingAsset.identifier;
         var player = assetId ? this.getAssetPlayer(assetId) : null;
         if (player && assetId && (!this.eventItemsMatch(currentItem, scheduledItem) || assetListIndex !== undefined && assetId !== ((_interstitial$assetLi = interstitial.assetList) == null ? void 0 : _interstitial$assetLi[assetListIndex].identifier))) {
+          var _this$detachedData2;
           var _assetListIndex = interstitial.findAssetIndex(playingAsset);
           this.log("INTERSTITIAL_ASSET_ENDED " + (_assetListIndex + 1) + "/" + interstitial.assetList.length + " " + eventAssetToString(playingAsset));
           this.endedAsset = playingAsset;
@@ -24576,7 +24597,7 @@
             player: player
           });
           this.retreiveMediaSource(assetId, scheduledItem);
-          if (player.media && !this.detachedData) {
+          if (player.media && !((_this$detachedData2 = this.detachedData) != null && _this$detachedData2.mediaSource)) {
             player.detachMedia();
           }
         }
@@ -24606,7 +24627,7 @@
       this.advanceSchedule(index, scheduleItems, assetListIndex, currentItem, playingLastItem);
     };
     _proto.advanceSchedule = function advanceSchedule(index, scheduleItems, assetListIndex, currentItem, playedLastItem) {
-      var _this2 = this;
+      var _this3 = this;
       var scheduledItem = index >= 0 ? scheduleItems[index] : null;
       var media = this.primaryMedia;
       // Cleanup out of range Interstitials
@@ -24614,9 +24635,9 @@
       if (playerQueue.length) {
         playerQueue.forEach(function (player) {
           var interstitial = player.interstitial;
-          var queuedIndex = _this2.schedule.findEventIndex(interstitial.identifier);
+          var queuedIndex = _this3.schedule.findEventIndex(interstitial.identifier);
           if (queuedIndex < index || queuedIndex > index + 1) {
-            _this2.clearInterstitial(interstitial, scheduledItem);
+            _this3.clearInterstitial(interstitial, scheduledItem);
           }
         });
       }
@@ -24707,13 +24728,13 @@
       }
     };
     _proto.resumePrimary = function resumePrimary(scheduledItem, index, fromItem) {
-      var _this$detachedData2;
+      var _this$detachedData3;
       this.playingItem = scheduledItem;
       this.playingAsset = this.endedAsset = null;
       this.waitingItem = this.endedItem = null;
       this.bufferedToItem(scheduledItem);
       this.log("resuming " + segmentToString(scheduledItem));
-      if (!((_this$detachedData2 = this.detachedData) != null && _this$detachedData2.mediaSource)) {
+      if (!((_this$detachedData3 = this.detachedData) != null && _this$detachedData3.mediaSource)) {
         var timelinePos = this.timelinePos;
         if (timelinePos < scheduledItem.start || timelinePos >= scheduledItem.end) {
           timelinePos = this.getPrimaryResumption(scheduledItem, index);
@@ -24815,7 +24836,7 @@
         main: main
       });
       this.mediaSelection = currentSelection;
-      this.schedule.parseInterstitialDateRanges(currentSelection);
+      this.schedule.parseInterstitialDateRanges(currentSelection, this.hls.config.interstitialAppendInPlace);
       if (!this.effectivePlayingItem && this.schedule.items) {
         this.checkStart();
       }
@@ -24901,6 +24922,8 @@
       if (!this.playingLastItem && playingItem) {
         var playingIndex = this.findItemIndex(playingItem);
         this.setSchedulePosition(playingIndex + 1);
+      } else {
+        this.shouldPlay = false;
       }
     };
     _proto.updateItem = function updateItem(previousItem, time) {
@@ -24981,7 +25004,7 @@
       }
     };
     _proto.setBufferingItem = function setBufferingItem(item) {
-      var _this3 = this;
+      var _this4 = this;
       var bufferingLast = this.bufferingItem;
       var schedule = this.schedule;
       if (!this.itemsMatch(item, bufferingLast)) {
@@ -25000,7 +25023,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 = _this3.getAssetPlayer(asset.identifier);
+              var player = _this4.getAssetPlayer(asset.identifier);
               if (player) {
                 player.resumeBuffering();
               }
@@ -25074,16 +25097,16 @@
       }
     };
     _proto.preloadAssets = function preloadAssets(interstitial, assetListIndex) {
+      var uri = interstitial.assetUrl;
       var assetListLength = interstitial.assetList.length;
       var neverLoaded = assetListLength === 0 && !interstitial.assetListLoader;
       var playOnce = interstitial.cue.once;
       if (neverLoaded) {
-        this.log("Load interstitial asset " + (assetListIndex + 1) + "/" + assetListLength + " " + interstitial);
+        this.log("Load interstitial asset " + (assetListIndex + 1) + "/" + (uri ? 1 : assetListLength) + " " + interstitial);
         var timelineStart = interstitial.timelineStart;
         if (interstitial.appendInPlace) {
           this.flushFrontBuffer(timelineStart + 0.25);
         }
-        var uri = interstitial.assetUrl;
         if (uri) {
           return this.createAsset(interstitial, 0, 0, timelineStart, interstitial.duration, uri);
         }
@@ -25112,7 +25135,7 @@
       return null;
     };
     _proto.flushFrontBuffer = function flushFrontBuffer(startOffset) {
-      var _this4 = this;
+      var _this5 = this;
       // Force queued flushing of all buffers
       var requiredTracks = this.requiredTracks;
       if (!requiredTracks) {
@@ -25120,7 +25143,7 @@
       }
       var sourceBufferNames = Object.keys(requiredTracks);
       sourceBufferNames.forEach(function (type) {
-        _this4.hls.trigger(Events.BUFFER_FLUSHING, {
+        _this5.hls.trigger(Events.BUFFER_FLUSHING, {
           startOffset: startOffset,
           endOffset: Infinity,
           type: type
@@ -25167,7 +25190,7 @@
       return this.createAssetPlayer(interstitial, assetItem, assetListIndex);
     };
     _proto.createAssetPlayer = function createAssetPlayer(interstitial, assetItem, assetListIndex) {
-      var _this5 = this;
+      var _this6 = this;
       this.log("create HLSAssetPlayer for " + eventAssetToString(assetItem));
       var primary = this.hls;
       var userConfig = primary.userConfig;
@@ -25234,17 +25257,17 @@
             details: ErrorDetails.INTERSTITIAL_ASSET_ITEM_ERROR,
             error: error
           };
-          _this5.handleAssetItemError(errorData, interstitial, _this5.schedule.findEventIndex(interstitial.identifier), assetListIndex, error.message);
+          _this6.handleAssetItemError(errorData, interstitial, _this6.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) {
-          _this5.log("Interstitial asset \"" + assetId + "\" duration change " + currentAssetDuration + " > " + duration);
+          _this6.log("Interstitial asset \"" + assetId + "\" duration change " + currentAssetDuration + " > " + duration);
           assetItem.duration = duration;
           // Update schedule with new event and asset duration
-          _this5.updateSchedule();
+          _this6.updateSchedule();
         }
       };
       player.on(Events.LEVEL_UPDATED, function (event, _ref) {
@@ -25256,39 +25279,39 @@
         return updateAssetPlayerDetails(details);
       });
       var _onBufferCodecs = function onBufferCodecs(event, data) {
-        var inQueuPlayer = _this5.getAssetPlayer(assetId);
+        var inQueuPlayer = _this6.getAssetPlayer(assetId);
         if (inQueuPlayer && data.tracks) {
           inQueuPlayer.off(Events.BUFFER_CODECS, _onBufferCodecs);
           inQueuPlayer.tracks = data.tracks;
-          var media = _this5.primaryMedia;
-          if (_this5.bufferingAsset === inQueuPlayer.assetItem && media && !inQueuPlayer.media) {
-            _this5.bufferAssetPlayer(inQueuPlayer, media);
+          var media = _this6.primaryMedia;
+          if (_this6.bufferingAsset === inQueuPlayer.assetItem && media && !inQueuPlayer.media) {
+            _this6.bufferAssetPlayer(inQueuPlayer, media);
           }
         }
       };
       player.on(Events.BUFFER_CODECS, _onBufferCodecs);
       var _bufferedToEnd = function bufferedToEnd(name) {
-        var _this5$schedule$items;
-        var inQueuPlayer = _this5.getAssetPlayer(assetId);
-        _this5.log("buffered to end of asset " + inQueuPlayer);
+        var _this6$schedule$items;
+        var inQueuPlayer = _this6.getAssetPlayer(assetId);
+        _this6.log("buffered to end of asset " + inQueuPlayer);
         if (!inQueuPlayer) {
           return;
         }
         inQueuPlayer.off(Events.BUFFERED_TO_END, _bufferedToEnd);
 
         // Preload at end of asset
-        var scheduleIndex = _this5.schedule.findEventIndex(interstitial.identifier);
+        var scheduleIndex = _this6.schedule.findEventIndex(interstitial.identifier);
         var assetListIndex = interstitial.findAssetIndex(assetItem);
         var nextAssetIndex = assetListIndex + 1;
-        var item = (_this5$schedule$items = _this5.schedule.items) == null ? void 0 : _this5$schedule$items[scheduleIndex];
-        if (_this5.isInterstitial(item)) {
+        var item = (_this6$schedule$items = _this6.schedule.items) == null ? void 0 : _this6$schedule$items[scheduleIndex];
+        if (_this6.isInterstitial(item)) {
           if (assetListIndex !== -1 && !interstitial.isAssetPastPlayoutLimit(nextAssetIndex) && !interstitial.assetList[nextAssetIndex].error) {
-            _this5.bufferedToItem(item, assetListIndex + 1);
+            _this6.bufferedToItem(item, assetListIndex + 1);
           } else {
-            var _this5$schedule$items2;
-            var nextItem = (_this5$schedule$items2 = _this5.schedule.items) == null ? void 0 : _this5$schedule$items2[scheduleIndex + 1];
+            var _this6$schedule$items2;
+            var nextItem = (_this6$schedule$items2 = _this6.schedule.items) == null ? void 0 : _this6$schedule$items2[scheduleIndex + 1];
             if (nextItem) {
-              _this5.bufferedToItem(nextItem);
+              _this6.bufferedToItem(nextItem);
             }
           }
         }
@@ -25296,22 +25319,22 @@
       player.on(Events.BUFFERED_TO_END, _bufferedToEnd);
       var endedWithAssetIndex = function endedWithAssetIndex(assetIndex) {
         return function () {
-          var inQueuPlayer = _this5.getAssetPlayer(assetId);
+          var inQueuPlayer = _this6.getAssetPlayer(assetId);
           if (!inQueuPlayer) {
             return;
           }
-          _this5.shouldPlay = true;
-          var scheduleIndex = _this5.schedule.findEventIndex(interstitial.identifier);
-          _this5.advanceAfterAssetEnded(interstitial, scheduleIndex, assetIndex);
+          _this6.shouldPlay = true;
+          var scheduleIndex = _this6.schedule.findEventIndex(interstitial.identifier);
+          _this6.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) {
-        _this5.handleAssetItemError(data, interstitial, _this5.schedule.findEventIndex(interstitial.identifier), assetListIndex, "Asset player error " + data.error + " " + interstitial);
+        _this6.handleAssetItemError(data, interstitial, _this6.schedule.findEventIndex(interstitial.identifier), assetListIndex, "Asset player error " + data.error + " " + interstitial);
       });
       player.on(Events.DESTROYING, function () {
-        var inQueuPlayer = _this5.getAssetPlayer(assetId);
+        var inQueuPlayer = _this6.getAssetPlayer(assetId);
         if (!inQueuPlayer) {
           return;
         }
@@ -25322,7 +25345,7 @@
           details: ErrorDetails.INTERSTITIAL_ASSET_ITEM_ERROR,
           error: error
         };
-        _this5.handleAssetItemError(errorData, interstitial, _this5.schedule.findEventIndex(interstitial.identifier), assetListIndex, error.message);
+        _this6.handleAssetItemError(errorData, interstitial, _this6.schedule.findEventIndex(interstitial.identifier), assetListIndex, error.message);
       });
       this.hls.trigger(Events.INTERSTITIAL_ASSET_PLAYER_CREATED, {
         asset: assetItem,
@@ -25333,9 +25356,9 @@
       return player;
     };
     _proto.clearInterstitial = function clearInterstitial(interstitial, toSegment) {
-      var _this6 = this;
+      var _this7 = this;
       interstitial.assetList.forEach(function (asset) {
-        _this6.clearAssetPlayer(asset.identifier, toSegment);
+        _this7.clearAssetPlayer(asset.identifier, toSegment);
       });
       // Remove asset list and resolved duration
       interstitial.reset();
@@ -25383,12 +25406,10 @@
       }
 
       // 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);
     };
     _proto.bufferAssetPlayer = function bufferAssetPlayer(player, media) {
-      var _this$schedule$items2, _this$detachedData3;
+      var _this$schedule$items2, _this$detachedData4;
       var interstitial = player.interstitial,
         assetItem = player.assetItem,
         assetId = player.assetId;
@@ -25403,8 +25424,13 @@
       if (bufferingPlayer === player) {
         return;
       }
-      var activeTracks = (bufferingPlayer == null ? void 0 : bufferingPlayer.tracks) || ((_this$detachedData3 = this.detachedData) == null ? void 0 : _this$detachedData3.tracks) || this.requiredTracks;
-      if (interstitial.appendInPlace && assetItem !== this.playingAsset) {
+      var appendInPlaceNext = interstitial.appendInPlace;
+      if (appendInPlaceNext && (bufferingPlayer == null ? void 0 : bufferingPlayer.interstitial.appendInPlace) === false) {
+        // Media is detached and not available to append in place
+        return;
+      }
+      var activeTracks = (bufferingPlayer == null ? void 0 : bufferingPlayer.tracks) || ((_this$detachedData4 = this.detachedData) == null ? void 0 : _this$detachedData4.tracks) || this.requiredTracks;
+      if (appendInPlaceNext && assetItem !== this.playingAsset) {
         // Do not buffer another item if tracks are unknown or incompatible
         if (!player.tracks) {
           return;
@@ -25478,7 +25504,6 @@
       if (playingItem) {
         this.log("Fallback to primary from event \"" + interstitial.identifier + "\" start: " + flushStart + " pos: " + this.timelinePos + " playing: " + (playingItem ? segmentToString(playingItem) : '<none>') + " error: " + interstitial.error);
         if (interstitial.appendInPlace) {
-          interstitial.appendInPlace = false;
           this.attachPrimary(flushStart, null);
           this.flushFrontBuffer(flushStart);
         }
@@ -25490,6 +25515,8 @@
         if (!this.itemsMatch(playingItem, newPlayingItem)) {
           var scheduleIndex = this.schedule.findItemIndexAtTime(timelinePos);
           this.setSchedulePosition(scheduleIndex);
+        } else {
+          this.clearInterstitial(interstitial, null);
         }
       } else {
         this.checkStart();
@@ -25499,7 +25526,7 @@
     // Asset List loading
     ;
     _proto.onAssetListLoaded = function onAssetListLoaded(event, data) {
-      var _this7 = this,
+      var _this8 = this,
         _this$bufferingItem;
       var interstitial = data.event;
       var interstitialId = interstitial.identifier;
@@ -25512,7 +25539,7 @@
       var sumDuration = 0;
       assets.forEach(function (asset, assetListIndex) {
         var duration = parseFloat(asset.DURATION);
-        _this7.createAsset(interstitial, assetListIndex, sumDuration, eventStart + sumDuration, duration, asset.URI);
+        _this8.createAsset(interstitial, assetListIndex, sumDuration, eventStart + sumDuration, duration, asset.URI);
         sumDuration += duration;
       });
       interstitial.duration = sumDuration;
@@ -25900,8 +25927,8 @@
     }, {
       key: "primaryMedia",
       get: function get() {
-        var _this$detachedData4;
-        return this.media || ((_this$detachedData4 = this.detachedData) == null ? void 0 : _this$detachedData4.media) || null;
+        var _this$detachedData5;
+        return this.media || ((_this$detachedData5 = this.detachedData) == null ? void 0 : _this$detachedData5.media) || null;
       }
     }, {
       key: "playbackDisabled",
@@ -26251,21 +26278,22 @@
         } else {
           foundFrag = fragments[fragLen - 1];
         }
+        foundFrag = this.filterReplacedPrimary(foundFrag, track.details);
         if (!foundFrag) {
           return;
         }
-        foundFrag = this.mapToInitFragWhenRequired(foundFrag);
-        if (isMediaFragment(foundFrag)) {
-          // Load earlier fragment in same discontinuity to make up for misaligned playlists and cues that extend beyond end of segment
-          var curSNIdx = foundFrag.sn - trackDetails.startSN;
-          var 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
+        var curSNIdx = foundFrag.sn - trackDetails.startSN;
+        var 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);
+          var fragToLoad = this.mapToInitFragWhenRequired(foundFrag);
+          if (fragToLoad) {
+            this.loadFragment(fragToLoad, track, targetBufferTime);
+          }
         }
       }
     };