hls.js 1.6.0-beta.2.0.canary.10939 → 1.6.0-beta.2.0.canary.10942

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.2.0.canary.10939"}`);
+      newLogger.log(`Debug logs enabled for "${context}" in hls.js version ${"1.6.0-beta.2.0.canary.10942"}`);
     } catch (e) {
       /* log fn threw an exception. All logger methods are no-ops. */
       return createLogger();
@@ -8364,6 +8364,16 @@ class BaseStreamController extends TaskLoop {
           }
         }
       }
+      // Skip loading of fragments that overlap completely with appendInPlace interstitals
+      const playerQueue = interstitials == null ? undefined : 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);
@@ -9873,7 +9883,7 @@ var eventemitter3 = {exports: {}};
 var eventemitter3Exports = eventemitter3.exports;
 var EventEmitter = /*@__PURE__*/getDefaultExportFromCjs(eventemitter3Exports);
 
-const version = "1.6.0-beta.2.0.canary.10939";
+const version = "1.6.0-beta.2.0.canary.10942";
 
 // ensure the worker ends up in the bundle
 // If the worker should not be included this gets aliased to empty.js
@@ -16423,23 +16433,27 @@ class AudioStreamController extends BaseStreamController {
     }
 
     // Request audio segments up to one fragment ahead of main stream-controller
-    const mainFragLoading = (_this$mainFragLoading = this.mainFragLoading) == null ? undefined : _this$mainFragLoading.frag;
-    if (!this.audioOnly && this.startFragRequested && mainFragLoading && isMediaFragment(mainFragLoading) && isMediaFragment(frag) && !frag.endList && (!trackDetails.live || !this.loadingParts && targetBufferTime < this.hls.liveSyncPosition)) {
-      let mainFrag = mainFragLoading;
-      if (frag.start > mainFrag.end) {
-        // Get buffered frag at target position from tracker (loaded out of sequence)
-        const mainFragAtPos = this.fragmentTracker.getFragAtPos(targetBufferTime, PlaylistLevelType.MAIN);
-        if (mainFragAtPos && mainFragAtPos.end > mainFragLoading.end) {
-          mainFrag = mainFragAtPos;
-          this.mainFragLoading = {
-            frag: mainFragAtPos,
-            targetBufferTime: null
-          };
+    let mainFragLoading = ((_this$mainFragLoading = this.mainFragLoading) == null ? undefined : _this$mainFragLoading.frag) || null;
+    if (!this.audioOnly && this.startFragRequested && mainFragLoading && isMediaFragment(frag) && !frag.endList && (!trackDetails.live || !this.loadingParts && targetBufferTime < this.hls.liveSyncPosition)) {
+      if (this.fragmentTracker.getState(mainFragLoading) === FragmentState.OK) {
+        this.mainFragLoading = mainFragLoading = null;
+      }
+      if (mainFragLoading && isMediaFragment(mainFragLoading)) {
+        if (frag.start > mainFragLoading.end) {
+          // Get buffered frag at target position from tracker (loaded out of sequence)
+          const mainFragAtPos = this.fragmentTracker.getFragAtPos(targetBufferTime, PlaylistLevelType.MAIN);
+          if (mainFragAtPos && mainFragAtPos.end > mainFragLoading.end) {
+            mainFragLoading = mainFragAtPos;
+            this.mainFragLoading = {
+              frag: mainFragAtPos,
+              targetBufferTime: null
+            };
+          }
+        }
+        const atBufferSyncLimit = frag.start > mainFragLoading.end;
+        if (atBufferSyncLimit) {
+          return;
         }
-      }
-      const atBufferSyncLimit = frag.start > mainFrag.end;
-      if (atBufferSyncLimit) {
-        return;
       }
     }
     this.loadFragment(frag, levelInfo, targetBufferTime);
@@ -22953,7 +22967,8 @@ class HlsAssetPlayer {
     return this.assetItem.parentIdentifier;
   }
   get media() {
-    return this.hls.media;
+    var _this$hls2;
+    return ((_this$hls2 = this.hls) == null ? undefined : _this$hls2.media) || null;
   }
   get bufferedEnd() {
     const media = this.media || this.mediaAttached;
@@ -22986,7 +23001,8 @@ class HlsAssetPlayer {
     return Math.max(0, duration - this.currentTime);
   }
   get timelineOffset() {
-    return this.hls.config.timelineOffset || 0;
+    var _this$hls3;
+    return ((_this$hls3 = this.hls) == null ? undefined : _this$hls3.config.timelineOffset) || 0;
   }
   set timelineOffset(value) {
     const timelineOffset = this.timelineOffset;
@@ -23113,6 +23129,8 @@ class InterstitialsSchedule extends Logger {
       // Only return index of a Primary Item
       while (index >= 0 && (_items$index = items[index]) != null && _items$index.event) {
         var _items$index;
+        // If index found is an interstitial it is not a valid result as it should have been matched up top
+        // decrement until result is negative (not found) or a primary segment
         index--;
       }
     }
@@ -23495,12 +23513,16 @@ class InterstitialsSchedule extends Logger {
       this.log(`"${interstitial.identifier}" resumption ${resumeTime} can not be aligned with media (none selected)`);
       return false;
     }
-    return !Object.keys(mediaSelection).some(playlistType => {
+    const playlists = Object.keys(mediaSelection);
+    return !playlists.some(playlistType => {
       const details = mediaSelection[playlistType].details;
       const playlistEnd = details.edge;
       if (resumeTime > playlistEnd) {
-        this.log(`"${interstitial.identifier}" resumption ${resumeTime} past ${playlistType} playlist end ${playlistEnd}`);
-        return true;
+        if (playlists.length > 1) {
+          this.log(`"${interstitial.identifier}" resumption ${resumeTime} past ${playlistType} playlist end ${playlistEnd}`);
+          return true;
+        }
+        return false;
       }
       const startFragment = findFragmentByPTS(null, details.fragments, resumeTime);
       if (!startFragment) {
@@ -24236,11 +24258,11 @@ Schedule: ${scheduleItems.map(seg => segmentToString(seg))}`);
   get playingLastItem() {
     var _this$schedule;
     const playingItem = this.playingItem;
-    if (!this.playbackStarted || !playingItem) {
+    const items = (_this$schedule = this.schedule) == null ? undefined : _this$schedule.items;
+    if (!this.playbackStarted || !playingItem || !items) {
       return false;
     }
-    const items = (_this$schedule = this.schedule) == null ? undefined : _this$schedule.items;
-    return this.itemsMatch(playingItem, items ? items[items.length - 1] : null);
+    return this.findItemIndex(playingItem) === items.length - 1;
   }
   get playbackStarted() {
     return this.playingItem !== null;
@@ -24286,6 +24308,7 @@ Schedule: ${scheduleItems.map(seg => segmentToString(seg))}`);
     const appendInPlace = player.interstitial.appendInPlace;
     const playerMedia = player.media;
     if (appendInPlace && playerMedia === this.primaryMedia) {
+      this.bufferingAsset = null;
       if (!toSegment || this.isInterstitial(toSegment) && !toSegment.event.appendInPlace) {
         // MediaSource cannot be transfered back to an Interstitial that requires a source reset
         // no-op when toSegment is undefined
@@ -24293,12 +24316,11 @@ Schedule: ${scheduleItems.map(seg => segmentToString(seg))}`);
           this.detachedData = {
             media: playerMedia
           };
+          return;
         }
-        return;
       }
       const attachMediaSourceData = player.transferMedia();
       this.log(`transfer MediaSource from ${player} ${JSON.stringify(attachMediaSourceData)}`);
-      this.bufferingAsset = null;
       this.detachedData = attachMediaSourceData;
     } else if (toSegment && playerMedia) {
       this.shouldPlay || (this.shouldPlay = !playerMedia.paused);
@@ -24348,7 +24370,7 @@ MediaSource ${JSON.stringify(attachMediaSourceData)} from ${logFromSource}`);
       dataToAttach.overrides = {
         duration: this.schedule.duration,
         endOfStream: !isAssetPlayer || isAssetAtEndOfSchedule,
-        cueRemoval: false
+        cueRemoval: !isAssetPlayer
       };
     }
     player.attachMedia(dataToAttach);
@@ -24748,7 +24770,7 @@ MediaSource ${JSON.stringify(attachMediaSourceData)} from ${logFromSource}`);
     if (playingItem && !this.itemsMatch(playingItem, this.bufferingItem) && !this.isInterstitial(playingItem)) {
       const timelinePos = this.timelinePos;
       this.bufferedPos = timelinePos;
-      this.setBufferingItem(playingItem);
+      this.checkBuffer();
     }
   }
   onBufferedToEnd(event) {
@@ -24787,8 +24809,7 @@ MediaSource ${JSON.stringify(attachMediaSourceData)} from ${logFromSource}`);
     return null;
   }
   itemsMatch(a, b) {
-    var _a$nextEvent, _b$nextEvent;
-    return !!b && (a === b || a.event && b.event && this.eventItemsMatch(a, b) || !a.event && !b.event && ((_a$nextEvent = a.nextEvent) == null ? undefined : _a$nextEvent.identifier) === ((_b$nextEvent = b.nextEvent) == null ? undefined : _b$nextEvent.identifier));
+    return !!b && (a === b || a.event && b.event && this.eventItemsMatch(a, b) || !a.event && !b.event && this.findItemIndex(a) === this.findItemIndex(b));
   }
   eventItemsMatch(a, b) {
     var _b$event;
@@ -24829,11 +24850,11 @@ MediaSource ${JSON.stringify(attachMediaSourceData)} from ${logFromSource}`);
     const playingIndex = this.findItemIndex(playingItem);
     let bufferEndIndex = schedule.findItemIndexAtTime(bufferEnd);
     if (this.bufferedPos < bufferEnd) {
-      var _bufferingItem$event;
+      var _nextItemToBuffer$eve, _bufferingItem$event;
       const bufferingIndex = this.findItemIndex(bufferingItem);
       const nextToBufferIndex = Math.min(bufferingIndex + 1, items.length - 1);
       const nextItemToBuffer = items[nextToBufferIndex];
-      if (bufferEndIndex === -1 && bufferingItem && bufferEnd >= bufferingItem.end) {
+      if (bufferEndIndex === -1 && bufferingItem && bufferEnd >= bufferingItem.end || (_nextItemToBuffer$eve = nextItemToBuffer.event) != null && _nextItemToBuffer$eve.appendInPlace && bufferEnd + 0.01 >= nextItemToBuffer.start) {
         bufferEndIndex = nextToBufferIndex;
       }
       if (nextToBufferIndex - playingIndex > 1 && (bufferingItem == null ? undefined : (_bufferingItem$event = bufferingItem.event) == null ? undefined : _bufferingItem$event.appendInPlace) === false) {
@@ -25201,9 +25222,6 @@ MediaSource ${JSON.stringify(attachMediaSourceData)} from ${logFromSource}`);
     interstitial.appendInPlaceStarted = false;
   }
   clearAssetPlayer(assetId, toSegment) {
-    if (toSegment === null) {
-      return;
-    }
     const playerIndex = this.getAssetPlayerQueueIndex(assetId);
     if (playerIndex !== -1) {
       this.log(`clearAssetPlayer "${assetId}" toSegment: ${toSegment ? segmentToString(toSegment) : toSegment}`);
@@ -30040,7 +30058,7 @@ class GapController extends TaskLoop {
    * @private
    */
   _tryFixBufferStall(bufferInfo, stalledDurationMs) {
-    var _this$hls3;
+    var _this$hls3, _this$hls4;
     const {
       fragmentTracker,
       media
@@ -30050,8 +30068,9 @@ class GapController extends TaskLoop {
       return;
     }
     const currentTime = media.currentTime;
+    const levelDetails = (_this$hls4 = this.hls) == null ? undefined : _this$hls4.latestLevelDetails;
     const partial = fragmentTracker.getPartialFragment(currentTime);
-    if (partial) {
+    if (partial || levelDetails != null && levelDetails.live && currentTime < levelDetails.fragmentStart) {
       // Try to skip over the buffer hole caused by a partial fragment
       // This method isn't limited by the size of the gap between buffered ranges
       const targetTime = this._trySkipBufferHole(partial);
@@ -30112,12 +30131,12 @@ class GapController extends TaskLoop {
    * @private
    */
   _trySkipBufferHole(partial) {
-    var _this$hls4;
+    var _this$hls5;
     const {
       fragmentTracker,
       media
     } = this;
-    const config = (_this$hls4 = this.hls) == null ? undefined : _this$hls4.config;
+    const config = (_this$hls5 = this.hls) == null ? undefined : _this$hls5.config;
     if (!media || !fragmentTracker || !config) {
       return 0;
     }
@@ -31477,14 +31496,18 @@ class StreamController extends BaseStreamController {
     this.onMediaSeeked = () => {
       const media = this.media;
       const currentTime = media ? media.currentTime : null;
-      if (isFiniteNumber(currentTime)) {
-        this.log(`Media seeked to ${currentTime.toFixed(3)}`);
+      if (currentTime === null || !isFiniteNumber(currentTime)) {
+        return;
       }
+      this.log(`Media seeked to ${currentTime.toFixed(3)}`);
 
       // If seeked was issued before buffer was appended do not tick immediately
-      const bufferInfo = this.getMainFwdBufferInfo();
+      if (!this.getBufferedFrag(currentTime)) {
+        return;
+      }
+      const bufferInfo = this.getFwdBufferInfoAtPos(media, currentTime, PlaylistLevelType.MAIN, 0);
       if (bufferInfo === null || bufferInfo.len === 0) {
-        this.warn(`Main forward buffer length on "seeked" event ${bufferInfo ? bufferInfo.len : 'empty'})`);
+        this.warn(`Main forward buffer length at ${currentTime} on "seeked" event ${bufferInfo ? bufferInfo.len : 'empty'})`);
         return;
       }