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

package/dist/hls.d.mts

@@ -352,7 +352,7 @@ export declare class BaseStreamController extends TaskLoop implements NetworkCom
     protected bufferFragmentData(data: RemuxedTrack, frag: Fragment, part: Part | null, chunkMeta: ChunkMetadata, noBacktracking?: boolean): void;
     protected flushBufferGap(frag: Fragment): void;
     protected getFwdBufferInfo(bufferable: Bufferable | null, type: PlaylistLevelType): BufferInfo | null;
-    private getFwdBufferInfoAtPos;
+    protected getFwdBufferInfoAtPos(bufferable: Bufferable | null, pos: number, type: PlaylistLevelType, maxBufferHole: number): BufferInfo | null;
     protected getMaxBufferLength(levelBitrate?: number): number;
     protected reduceMaxBufferLength(threshold: number, fragDuration: number): boolean;
     protected getAppendedFrag(position: number, playlistType?: PlaylistLevelType): Fragment | null;

package/dist/hls.d.ts

@@ -352,7 +352,7 @@ export declare class BaseStreamController extends TaskLoop implements NetworkCom
     protected bufferFragmentData(data: RemuxedTrack, frag: Fragment, part: Part | null, chunkMeta: ChunkMetadata, noBacktracking?: boolean): void;
     protected flushBufferGap(frag: Fragment): void;
     protected getFwdBufferInfo(bufferable: Bufferable | null, type: PlaylistLevelType): BufferInfo | null;
-    private getFwdBufferInfoAtPos;
+    protected getFwdBufferInfoAtPos(bufferable: Bufferable | null, pos: number, type: PlaylistLevelType, maxBufferHole: number): BufferInfo | null;
     protected getMaxBufferLength(levelBitrate?: number): number;
     protected reduceMaxBufferLength(threshold: number, fragDuration: number): boolean;
     protected getAppendedFrag(position: number, playlistType?: PlaylistLevelType): Fragment | null;

package/dist/hls.js

@@ -1059,7 +1059,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.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();
@@ -9099,6 +9099,16 @@
             }
           }
         }
+        // Skip loading of fragments that overlap completely with appendInPlace interstitals
+        var playerQueue = interstitials == null ? undefined : 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);
@@ -16348,7 +16358,7 @@
     return !remuxResult.audio && !remuxResult.video && !remuxResult.text && !remuxResult.id3 && !remuxResult.initSegment;
   }
 
-  var version = "1.6.0-beta.2.0.canary.10939";
+  var 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
@@ -17011,23 +17021,27 @@
       }
 
       // Request audio segments up to one fragment ahead of main stream-controller
-      var 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)) {
-        var mainFrag = mainFragLoading;
-        if (frag.start > mainFrag.end) {
-          // Get buffered frag at target position from tracker (loaded out of sequence)
-          var mainFragAtPos = this.fragmentTracker.getFragAtPos(targetBufferTime, PlaylistLevelType.MAIN);
-          if (mainFragAtPos && mainFragAtPos.end > mainFragLoading.end) {
-            mainFrag = mainFragAtPos;
-            this.mainFragLoading = {
-              frag: mainFragAtPos,
-              targetBufferTime: null
-            };
+      var 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)
+            var mainFragAtPos = this.fragmentTracker.getFragAtPos(targetBufferTime, PlaylistLevelType.MAIN);
+            if (mainFragAtPos && mainFragAtPos.end > mainFragLoading.end) {
+              mainFragLoading = mainFragAtPos;
+              this.mainFragLoading = {
+                frag: mainFragAtPos,
+                targetBufferTime: null
+              };
+            }
+          }
+          var atBufferSyncLimit = frag.start > mainFragLoading.end;
+          if (atBufferSyncLimit) {
+            return;
           }
-        }
-        var atBufferSyncLimit = frag.start > mainFrag.end;
-        if (atBufferSyncLimit) {
-          return;
         }
       }
       this.loadFragment(frag, levelInfo, targetBufferTime);
@@ -23183,7 +23197,8 @@
     }, {
       key: "media",
       get: function get() {
-        return this.hls.media;
+        var _this$hls2;
+        return ((_this$hls2 = this.hls) == null ? undefined : _this$hls2.media) || null;
       }
     }, {
       key: "bufferedEnd",
@@ -23226,7 +23241,8 @@
     }, {
       key: "timelineOffset",
       get: function get() {
-        return this.hls.config.timelineOffset || 0;
+        var _this$hls3;
+        return ((_this$hls3 = this.hls) == null ? undefined : _this$hls3.config.timelineOffset) || 0;
       },
       set: function set(value) {
         var timelineOffset = this.timelineOffset;
@@ -23306,6 +23322,8 @@
         // 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--;
         }
       }
@@ -23684,12 +23702,16 @@
         this.log("\"" + interstitial.identifier + "\" resumption " + resumeTime + " can not be aligned with media (none selected)");
         return false;
       }
-      return !Object.keys(mediaSelection).some(function (playlistType) {
+      var playlists = Object.keys(mediaSelection);
+      return !playlists.some(function (playlistType) {
         var details = mediaSelection[playlistType].details;
         var playlistEnd = details.edge;
         if (resumeTime > playlistEnd) {
-          _this4.log("\"" + interstitial.identifier + "\" resumption " + resumeTime + " past " + playlistType + " playlist end " + playlistEnd);
-          return true;
+          if (playlists.length > 1) {
+            _this4.log("\"" + interstitial.identifier + "\" resumption " + resumeTime + " past " + playlistType + " playlist end " + playlistEnd);
+            return true;
+          }
+          return false;
         }
         var startFragment = findFragmentByPTS(null, details.fragments, resumeTime);
         if (!startFragment) {
@@ -24244,6 +24266,7 @@
       var appendInPlace = player.interstitial.appendInPlace;
       var 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
@@ -24251,12 +24274,11 @@
             this.detachedData = {
               media: playerMedia
             };
+            return;
           }
-          return;
         }
         var 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);
@@ -24305,7 +24327,7 @@
         dataToAttach.overrides = {
           duration: this.schedule.duration,
           endOfStream: !isAssetPlayer || isAssetAtEndOfSchedule,
-          cueRemoval: false
+          cueRemoval: !isAssetPlayer
         };
       }
       player.attachMedia(dataToAttach);
@@ -24698,7 +24720,7 @@
       if (playingItem && !this.itemsMatch(playingItem, this.bufferingItem) && !this.isInterstitial(playingItem)) {
         var timelinePos = this.timelinePos;
         this.bufferedPos = timelinePos;
-        this.setBufferingItem(playingItem);
+        this.checkBuffer();
       }
     };
     _proto.onBufferedToEnd = function onBufferedToEnd(event) {
@@ -24737,8 +24759,7 @@
       return null;
     };
     _proto.itemsMatch = function 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));
     };
     _proto.eventItemsMatch = function eventItemsMatch(a, b) {
       var _b$event;
@@ -24780,11 +24801,11 @@
       var playingIndex = this.findItemIndex(playingItem);
       var bufferEndIndex = schedule.findItemIndexAtTime(bufferEnd);
       if (this.bufferedPos < bufferEnd) {
-        var _bufferingItem$event;
+        var _nextItemToBuffer$eve, _bufferingItem$event;
         var bufferingIndex = this.findItemIndex(bufferingItem);
         var nextToBufferIndex = Math.min(bufferingIndex + 1, items.length - 1);
         var 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) {
@@ -25161,9 +25182,6 @@
       interstitial.appendInPlaceStarted = false;
     };
     _proto.clearAssetPlayer = function clearAssetPlayer(assetId, toSegment) {
-      if (toSegment === null) {
-        return;
-      }
       var playerIndex = this.getAssetPlayerQueueIndex(assetId);
       if (playerIndex !== -1) {
         this.log("clearAssetPlayer \"" + assetId + "\" toSegment: " + (toSegment ? segmentToString(toSegment) : toSegment));
@@ -25631,11 +25649,11 @@
       get: function get() {
         var _this$schedule;
         var playingItem = this.playingItem;
-        if (!this.playbackStarted || !playingItem) {
+        var items = (_this$schedule = this.schedule) == null ? undefined : _this$schedule.items;
+        if (!this.playbackStarted || !playingItem || !items) {
           return false;
         }
-        var 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;
       }
     }, {
       key: "playbackStarted",
@@ -30955,7 +30973,7 @@
      * @private
      */;
     _proto._tryFixBufferStall = function _tryFixBufferStall(bufferInfo, stalledDurationMs) {
-      var _this$hls3;
+      var _this$hls3, _this$hls4;
       var fragmentTracker = this.fragmentTracker,
         media = this.media;
       var config = (_this$hls3 = this.hls) == null ? undefined : _this$hls3.config;
@@ -30963,8 +30981,9 @@
         return;
       }
       var currentTime = media.currentTime;
+      var levelDetails = (_this$hls4 = this.hls) == null ? undefined : _this$hls4.latestLevelDetails;
       var 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
         var targetTime = this._trySkipBufferHole(partial);
@@ -31023,10 +31042,10 @@
      * @private
      */;
     _proto._trySkipBufferHole = function _trySkipBufferHole(partial) {
-      var _this$hls4;
+      var _this$hls5;
       var fragmentTracker = this.fragmentTracker,
         media = this.media;
-      var config = (_this$hls4 = this.hls) == null ? undefined : _this$hls4.config;
+      var config = (_this$hls5 = this.hls) == null ? undefined : _this$hls5.config;
       if (!media || !fragmentTracker || !config) {
         return 0;
       }
@@ -32415,14 +32434,18 @@
       _this.onMediaSeeked = function () {
         var media = _this.media;
         var 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
-        var bufferInfo = _this.getMainFwdBufferInfo();
+        if (!_this.getBufferedFrag(currentTime)) {
+          return;
+        }
+        var 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;
         }
 

package/dist/hls.js.d.ts

@@ -352,7 +352,7 @@ export declare class BaseStreamController extends TaskLoop implements NetworkCom
     protected bufferFragmentData(data: RemuxedTrack, frag: Fragment, part: Part | null, chunkMeta: ChunkMetadata, noBacktracking?: boolean): void;
     protected flushBufferGap(frag: Fragment): void;
     protected getFwdBufferInfo(bufferable: Bufferable | null, type: PlaylistLevelType): BufferInfo | null;
-    private getFwdBufferInfoAtPos;
+    protected getFwdBufferInfoAtPos(bufferable: Bufferable | null, pos: number, type: PlaylistLevelType, maxBufferHole: number): BufferInfo | null;
     protected getMaxBufferLength(levelBitrate?: number): number;
     protected reduceMaxBufferLength(threshold: number, fragDuration: number): boolean;
     protected getAppendedFrag(position: number, playlistType?: PlaylistLevelType): Fragment | null;