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

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-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();
@@ -7955,15 +7955,12 @@ function findPart(partList, sn, partIndex) {
 function reassignFragmentLevelIndexes(levels) {
   levels.forEach((level, index) => {
     var _level$details;
-    const fragments = (_level$details = level.details) == null ? void 0 : _level$details.fragments;
-    if (fragments) {
-      fragments.forEach(fragment => {
-        fragment.level = index;
-        if (fragment.initSegment) {
-          fragment.initSegment.level = index;
-        }
-      });
-    }
+    (_level$details = level.details) == null ? void 0 : _level$details.fragments.forEach(fragment => {
+      fragment.level = index;
+      if (fragment.initSegment) {
+        fragment.initSegment.level = index;
+      }
+    });
   });
 }
 
@@ -8374,6 +8371,7 @@ class BaseStreamController extends TaskLoop {
     this.media = this.mediaBuffer = null;
     this.loopSn = undefined;
     if (transferringMedia) {
+      this.resetLoadingState();
       this.resetTransmuxer();
       return;
     }
@@ -8416,42 +8414,6 @@ class BaseStreamController extends TaskLoop {
     super.onHandlerDestroyed();
   }
   loadFragment(frag, level, targetBufferTime) {
-    const config = this.hls.config;
-    if (config.interstitialsController && config.enableInterstitialPlayback !== false && frag.type !== PlaylistLevelType.SUBTITLE) {
-      // Do not load fragments outside the buffering schedule segment
-      const interstitials = this.hls.interstitialsManager;
-      const bufferingItem = interstitials == null ? void 0 : interstitials.bufferingItem;
-      if (bufferingItem) {
-        const bufferingInterstitial = bufferingItem.event;
-        if (bufferingInterstitial) {
-          // Do not stream fragments while buffering Interstitial Events (except for overlap at the start)
-          if (bufferingInterstitial.appendInPlace || Math.abs(frag.start - bufferingItem.start) > 1 || bufferingItem.start === 0) {
-            return;
-          }
-        } else {
-          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
-      const playerQueue = interstitials == null ? void 0 : interstitials.playerQueue;
-      if (playerQueue) {
-        for (let i = playerQueue.length; i--;) {
-          const interstitial = playerQueue[i].interstitial;
-          if (interstitial.appendInPlace && frag.start >= interstitial.startTime && frag.end <= interstitial.resumeTime) {
-            return;
-          }
-        }
-      }
-    }
     this.startFragRequested = true;
     this._loadFragForPlayback(frag, level, targetBufferTime);
   }
@@ -8800,9 +8762,9 @@ class BaseStreamController extends TaskLoop {
   }
   doFragPartsLoad(frag, fromPart, level, progressCallback) {
     return new Promise((resolve, reject) => {
-      var _level$details2;
+      var _level$details;
       const partsLoaded = [];
-      const initialPartList = (_level$details2 = level.details) == null ? void 0 : _level$details2.partList;
+      const initialPartList = (_level$details = level.details) == null ? void 0 : _level$details.partList;
       const loadPart = part => {
         this.fragmentLoader.loadPart(frag, part, progressCallback).then(partLoadedData => {
           partsLoaded[part.index] = partLoadedData;
@@ -9077,6 +9039,7 @@ 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);
   }
   isLoopLoading(frag, targetBufferTime) {
@@ -9104,6 +9067,48 @@ class BaseStreamController extends TaskLoop {
     this.loopSn = undefined;
     return nextFragment;
   }
+  filterReplacedPrimary(frag, details) {
+    if (!frag) {
+      return frag;
+    }
+    const config = this.hls.config;
+    if (config.interstitialsController && config.enableInterstitialPlayback !== false && frag.type !== PlaylistLevelType.SUBTITLE) {
+      // Do not load fragments outside the buffering schedule segment
+      const interstitials = this.hls.interstitialsManager;
+      const bufferingItem = interstitials == null ? void 0 : interstitials.bufferingItem;
+      if (bufferingItem) {
+        const bufferingInterstitial = bufferingItem.event;
+        if (bufferingInterstitial) {
+          // Do not stream fragments while buffering Interstitial Events (except for overlap at the start)
+          if (bufferingInterstitial.appendInPlace || Math.abs(frag.start - bufferingItem.start) > 1 || bufferingItem.start === 0) {
+            return null;
+          }
+        } else {
+          // Limit fragment loading to media in schedule item
+          if (frag.end <= bufferingItem.start && (details == 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
+      const playerQueue = interstitials == null ? void 0 : interstitials.playerQueue;
+      if (playerQueue) {
+        for (let i = playerQueue.length; i--;) {
+          const interstitial = playerQueue[i].interstitial;
+          if (interstitial.appendInPlace && frag.start >= interstitial.startTime && frag.end <= interstitial.resumeTime) {
+            return null;
+          }
+        }
+      }
+    }
+    return frag;
+  }
   mapToInitFragWhenRequired(frag) {
     // If an initSegment is present, it must be buffered first
     if (frag != null && frag.initSegment && !(frag != null && frag.initSegment.data) && !this.bitrateTest) {
@@ -9968,7 +9973,7 @@ function requireEventemitter3 () {
 var eventemitter3Exports = requireEventemitter3();
 var EventEmitter = /*@__PURE__*/getDefaultExportFromCjs(eventemitter3Exports);
 
-const version = "1.6.0-beta.4.0.canary.11044";
+const 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
@@ -17851,15 +17856,14 @@ class BufferController extends Logger {
       if (!media || !mediaSource) {
         return;
       }
+      // once received, don't listen anymore to sourceopen event
+      mediaSource.removeEventListener('sourceopen', this._onMediaSourceOpen);
       media.removeEventListener('emptied', this._onMediaEmptied);
       this.updateDuration();
       this.hls.trigger(Events.MEDIA_ATTACHED, {
         media,
         mediaSource: mediaSource
       });
-
-      // once received, don't listen anymore to sourceopen event
-      mediaSource.removeEventListener('sourceopen', this._onMediaSourceOpen);
       if (this.mediaSource !== null) {
         this.checkPendingTracks();
       }
@@ -23036,6 +23040,7 @@ class HlsAssetPlayer {
     this.tracks = null;
     this.hasDetails = false;
     this.mediaAttached = null;
+    this._currentTime = void 0;
     this.checkPlayout = () => {
       const interstitial = this.interstitial;
       const playoutLimit = interstitial.playoutLimit;
@@ -23089,7 +23094,7 @@ class HlsAssetPlayer {
   get bufferedEnd() {
     const media = this.media || this.mediaAttached;
     if (!media) {
-      return 0;
+      return this.currentTime;
     }
     const bufferInfo = BufferHelper.bufferInfo(media, media.currentTime, 0.001);
     return this.getAssetTime(bufferInfo.end);
@@ -23097,7 +23102,7 @@ class HlsAssetPlayer {
   get currentTime() {
     const media = this.media || this.mediaAttached;
     if (!media) {
-      return 0;
+      return this._currentTime || 0;
     }
     return this.getAssetTime(media.currentTime);
   }
@@ -23142,6 +23147,7 @@ class HlsAssetPlayer {
   removeMediaListeners() {
     const media = this.mediaAttached;
     if (media) {
+      this._currentTime = media.currentTime;
       media.removeEventListener('timeupdate', this.checkPlayout);
     }
   }
@@ -23158,6 +23164,7 @@ class HlsAssetPlayer {
   }
   detachMedia() {
     this.removeMediaListeners();
+    this.mediaAttached = null;
     this.hls.detachMedia();
   }
   resumeBuffering() {
@@ -23179,7 +23186,8 @@ class HlsAssetPlayer {
     this.hls.off(event, listener);
   }
   toString() {
-    return `HlsAssetPlayer: ${eventAssetToString(this.assetItem)} ${this.hls.sessionId} ${this.interstitial.appendInPlace ? 'append-in-place' : ''}`;
+    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' : ''}`;
   }
 }
 
@@ -23336,7 +23344,7 @@ class InterstitialsSchedule extends Logger {
     }
     return null;
   }
-  parseInterstitialDateRanges(mediaSelection) {
+  parseInterstitialDateRanges(mediaSelection, enableAppendInPlace) {
     const details = mediaSelection.main.details;
     const {
       dateRanges
@@ -23344,7 +23352,7 @@ class InterstitialsSchedule extends Logger {
     const previousInterstitialEvents = this.events;
     const interstitialEvents = this.parseDateRanges(dateRanges, {
       url: details.url
-    });
+    }, enableAppendInPlace);
     const ids = Object.keys(dateRanges);
     const removedInterstitials = previousInterstitialEvents ? previousInterstitialEvents.filter(event => !ids.includes(event.identifier)) : [];
     if (interstitialEvents.length) {
@@ -23400,7 +23408,7 @@ class InterstitialsSchedule extends Logger {
       }
     }
   }
-  parseDateRanges(dateRanges, baseData) {
+  parseDateRanges(dateRanges, baseData, enableAppendInPlace) {
     const interstitialEvents = [];
     const ids = Object.keys(dateRanges);
     for (let i = 0; i < ids.length; i++) {
@@ -23415,6 +23423,9 @@ class InterstitialsSchedule extends Logger {
         } else {
           interstitial = new InterstitialEvent(dateRange, baseData);
           this.eventMap[id] = interstitial;
+          if (enableAppendInPlace === false) {
+            interstitial.appendInPlace = enableAppendInPlace;
+          }
         }
         interstitialEvents.push(interstitial);
       }
@@ -23618,13 +23629,11 @@ class InterstitialsSchedule extends Logger {
           interstitial.appendInPlace = false;
         }
       }
-      if (!interstitial.appendInPlace) {
+      if (!interstitial.appendInPlace && i + 1 < interstitialEvents.length) {
         // abutting Interstitials must use the same MediaSource strategy, this applies to all whether or not they are back to back:
-        for (let j = i - 1; i--;) {
-          const timeBetween = interstitialEvents[j + 1].startTime - interstitialEvents[j].resumeTime;
-          if (timeBetween < ABUTTING_THRESHOLD_SECONDS) {
-            interstitialEvents[j].appendInPlace = false;
-          }
+        const timeBetween = interstitialEvents[i + 1].startTime - interstitialEvents[i].resumeTime;
+        if (timeBetween < ABUTTING_THRESHOLD_SECONDS) {
+          interstitialEvents[i + 1].appendInPlace = false;
         }
       }
       // Update cumulativeDuration for next abutting interstitial with the same start date
@@ -23951,9 +23960,6 @@ class InterstitialsController extends Logger {
       const removedIds = removedInterstitials.map(interstitial => interstitial.identifier);
       const interstitialsUpdated = !!(interstitialEvents.length || removedIds.length);
       if (interstitialsUpdated) {
-        if (this.hls.config.interstitialAppendInPlace === false) {
-          interstitialEvents.forEach(event => event.appendInPlace = false);
-        }
         this.log(`INTERSTITIALS_UPDATED (${interstitialEvents.length}): ${interstitialEvents}
 Schedule: ${scheduleItems.map(seg => segmentToString(seg))}`);
       }
@@ -24083,10 +24089,12 @@ Schedule: ${scheduleItems.map(seg => segmentToString(seg))}`);
     this.pauseBuffering();
   }
   resumeBuffering() {
-    this.playerQueue.forEach(player => player.resumeBuffering());
+    var _this$getBufferingPla;
+    (_this$getBufferingPla = this.getBufferingPlayer()) == null ? void 0 : _this$getBufferingPla.resumeBuffering();
   }
   pauseBuffering() {
-    this.playerQueue.forEach(player => player.pauseBuffering());
+    var _this$getBufferingPla2;
+    (_this$getBufferingPla2 = this.getBufferingPlayer()) == null ? void 0 : _this$getBufferingPla2.pauseBuffering();
   }
   destroy() {
     this.unregisterListeners();
@@ -24524,33 +24532,48 @@ Schedule: ${scheduleItems.map(seg => segmentToString(seg))}`);
   }
   transferMediaTo(player, media) {
     var _this$detachedData2, _attachMediaSourceDat;
+    if (player.media === media) {
+      return;
+    }
     let attachMediaSourceData = null;
     const primaryPlayer = this.hls;
     const isAssetPlayer = player !== primaryPlayer;
     const appendInPlace = isAssetPlayer && player.interstitial.appendInPlace;
     const detachedMediaSource = (_this$detachedData2 = this.detachedData) == null ? void 0 : _this$detachedData2.mediaSource;
     let 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) {
       const bufferingPlayer = this.getBufferingPlayer();
       if (bufferingPlayer) {
         attachMediaSourceData = bufferingPlayer.transferMedia();
+        logFromSource = `${bufferingPlayer}`;
+      } else {
+        logFromSource = `detached MediaSource`;
       }
-      logFromSource = `${bufferingPlayer}`;
     } else {
-      logFromSource = `<unknown>`;
+      logFromSource = `detached media`;
     }
-    this.log(`transferring to ${isAssetPlayer ? player : 'Primary'}
-MediaSource ${stringify(attachMediaSourceData)} from ${logFromSource}`);
     if (!attachMediaSourceData) {
       if (detachedMediaSource) {
         attachMediaSourceData = this.detachedData;
         this.log(`using detachedData: MediaSource ${stringify(attachMediaSourceData)}`);
-      } else if (!this.detachedData || this.hls.media === media) {
-        // Media is attaching when `detachedData` and `hls.media` are populated. Detach to clear the MediaSource.
+      } else if (!this.detachedData || primaryPlayer.media === media) {
+        // Keep interstitial media transition consistent
+        const playerQueue = this.playerQueue;
+        if (playerQueue.length > 1) {
+          playerQueue.forEach(queuedPlayer => {
+            if (isAssetPlayer && queuedPlayer.interstitial.appendInPlace !== appendInPlace) {
+              const interstitial = queuedPlayer.interstitial;
+              this.clearInterstitial(queuedPlayer.interstitial, null);
+              interstitial.appendInPlace = false;
+            }
+          });
+        }
         this.hls.detachMedia();
         this.detachedData = {
           media
@@ -24559,7 +24582,7 @@ MediaSource ${stringify(attachMediaSourceData)} from ${logFromSource}`);
     }
     const transferring = attachMediaSourceData && 'mediaSource' in attachMediaSourceData && ((_attachMediaSourceDat = attachMediaSourceData.mediaSource) == null ? void 0 : _attachMediaSourceDat.readyState) !== 'closed';
     const 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) {
       const isAssetAtEndOfSchedule = isAssetPlayer && player.assetId === this.schedule.assetIdAtEnd;
       // Prevent asset players from marking EoS on transferred MediaSource
@@ -24656,6 +24679,7 @@ MediaSource ${stringify(attachMediaSourceData)} from ${logFromSource}`);
       const assetId = playingAsset == null ? void 0 : playingAsset.identifier;
       const 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$detachedData3;
         const _assetListIndex = interstitial.findAssetIndex(playingAsset);
         this.log(`INTERSTITIAL_ASSET_ENDED ${_assetListIndex + 1}/${interstitial.assetList.length} ${eventAssetToString(playingAsset)}`);
         this.endedAsset = playingAsset;
@@ -24669,7 +24693,7 @@ MediaSource ${stringify(attachMediaSourceData)} from ${logFromSource}`);
           player
         });
         this.retreiveMediaSource(assetId, scheduledItem);
-        if (player.media && !this.detachedData) {
+        if (player.media && !((_this$detachedData3 = this.detachedData) != null && _this$detachedData3.mediaSource)) {
           player.detachMedia();
         }
       }
@@ -24810,13 +24834,13 @@ MediaSource ${stringify(attachMediaSourceData)} from ${logFromSource}`);
     return !!((_this$primaryDetails = this.primaryDetails) != null && _this$primaryDetails.live);
   }
   resumePrimary(scheduledItem, index, fromItem) {
-    var _this$detachedData3;
+    var _this$detachedData4;
     this.playingItem = scheduledItem;
     this.playingAsset = this.endedAsset = null;
     this.waitingItem = this.endedItem = null;
     this.bufferedToItem(scheduledItem);
     this.log(`resuming ${segmentToString(scheduledItem)}`);
-    if (!((_this$detachedData3 = this.detachedData) != null && _this$detachedData3.mediaSource)) {
+    if (!((_this$detachedData4 = this.detachedData) != null && _this$detachedData4.mediaSource)) {
       let timelinePos = this.timelinePos;
       if (timelinePos < scheduledItem.start || timelinePos >= scheduledItem.end) {
         timelinePos = this.getPrimaryResumption(scheduledItem, index);
@@ -24917,7 +24941,7 @@ MediaSource ${stringify(attachMediaSourceData)} from ${logFromSource}`);
       main
     });
     this.mediaSelection = currentSelection;
-    this.schedule.parseInterstitialDateRanges(currentSelection);
+    this.schedule.parseInterstitialDateRanges(currentSelection, this.hls.config.interstitialAppendInPlace);
     if (!this.effectivePlayingItem && this.schedule.items) {
       this.checkStart();
     }
@@ -24999,6 +25023,8 @@ MediaSource ${stringify(attachMediaSourceData)} from ${logFromSource}`);
     if (!this.playingLastItem && playingItem) {
       const playingIndex = this.findItemIndex(playingItem);
       this.setSchedulePosition(playingIndex + 1);
+    } else {
+      this.shouldPlay = false;
     }
   }
   updateItem(previousItem, time) {
@@ -25167,16 +25193,16 @@ MediaSource ${stringify(attachMediaSourceData)} from ${logFromSource}`);
     }
   }
   preloadAssets(interstitial, assetListIndex) {
+    const uri = interstitial.assetUrl;
     const assetListLength = interstitial.assetList.length;
     const neverLoaded = assetListLength === 0 && !interstitial.assetListLoader;
     const playOnce = interstitial.cue.once;
     if (neverLoaded) {
-      this.log(`Load interstitial asset ${assetListIndex + 1}/${assetListLength} ${interstitial}`);
+      this.log(`Load interstitial asset ${assetListIndex + 1}/${uri ? 1 : assetListLength} ${interstitial}`);
       const timelineStart = interstitial.timelineStart;
       if (interstitial.appendInPlace) {
         this.flushFrontBuffer(timelineStart + 0.25);
       }
-      const uri = interstitial.assetUrl;
       if (uri) {
         return this.createAsset(interstitial, 0, 0, timelineStart, interstitial.duration, uri);
       }
@@ -25474,12 +25500,10 @@ MediaSource ${stringify(attachMediaSourceData)} from ${logFromSource}`);
     }
 
     // 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);
   }
   bufferAssetPlayer(player, media) {
-    var _this$schedule$items4, _this$detachedData4;
+    var _this$schedule$items4, _this$detachedData5;
     const {
       interstitial,
       assetItem,
@@ -25496,8 +25520,13 @@ MediaSource ${stringify(attachMediaSourceData)} from ${logFromSource}`);
     if (bufferingPlayer === player) {
       return;
     }
-    const activeTracks = (bufferingPlayer == null ? void 0 : bufferingPlayer.tracks) || ((_this$detachedData4 = this.detachedData) == null ? void 0 : _this$detachedData4.tracks) || this.requiredTracks;
-    if (interstitial.appendInPlace && assetItem !== this.playingAsset) {
+    const appendInPlaceNext = interstitial.appendInPlace;
+    if (appendInPlaceNext && (bufferingPlayer == null ? void 0 : bufferingPlayer.interstitial.appendInPlace) === false) {
+      // Media is detached and not available to append in place
+      return;
+    }
+    const activeTracks = (bufferingPlayer == null ? void 0 : bufferingPlayer.tracks) || ((_this$detachedData5 = this.detachedData) == null ? void 0 : _this$detachedData5.tracks) || this.requiredTracks;
+    if (appendInPlaceNext && assetItem !== this.playingAsset) {
       // Do not buffer another item if tracks are unknown or incompatible
       if (!player.tracks) {
         return;
@@ -25569,7 +25598,6 @@ MediaSource ${stringify(attachMediaSourceData)} from ${logFromSource}`);
     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);
       }
@@ -25581,6 +25609,8 @@ MediaSource ${stringify(attachMediaSourceData)} from ${logFromSource}`);
       if (!this.itemsMatch(playingItem, newPlayingItem)) {
         const scheduleIndex = this.schedule.findItemIndexAtTime(timelinePos);
         this.setSchedulePosition(scheduleIndex);
+      } else {
+        this.clearInterstitial(interstitial, null);
       }
     } else {
       this.checkStart();
@@ -25985,21 +26015,22 @@ class SubtitleStreamController extends BaseStreamController {
       } 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
-        const curSNIdx = foundFrag.sn - trackDetails.startSN;
-        const prevFrag = fragments[curSNIdx - 1];
-        if (prevFrag && prevFrag.cc === foundFrag.cc && this.fragmentTracker.getState(prevFrag) === FragmentState.NOT_LOADED) {
-          foundFrag = prevFrag;
-        }
+      // Load earlier fragment in same discontinuity to make up for misaligned playlists and cues that extend beyond end of segment
+      const curSNIdx = foundFrag.sn - trackDetails.startSN;
+      const prevFrag = fragments[curSNIdx - 1];
+      if (prevFrag && prevFrag.cc === foundFrag.cc && this.fragmentTracker.getState(prevFrag) === FragmentState.NOT_LOADED) {
+        foundFrag = prevFrag;
       }
       if (this.fragmentTracker.getState(foundFrag) === FragmentState.NOT_LOADED) {
         // only load if fragment is not loaded
-        this.loadFragment(foundFrag, track, targetBufferTime);
+        const fragToLoad = this.mapToInitFragWhenRequired(foundFrag);
+        if (fragToLoad) {
+          this.loadFragment(fragToLoad, track, targetBufferTime);
+        }
       }
     }
   }