hls.js 1.6.0-rc.2.0.canary.11081 → 1.6.0

package/dist/hls.d.mts

@@ -19,6 +19,7 @@ export declare class AbrController extends Logger implements AbrComponentAPI {
     private fragCurrent;
     private partCurrent;
     private bitrateTestDelay;
+    private rebufferNotice;
     bwEstimator: EwmaBandWidthEstimator;
     constructor(hls: Hls);
     resetEstimator(abrEwmaDefaultEstimate?: number): void;

package/dist/hls.d.ts

@@ -19,6 +19,7 @@ export declare class AbrController extends Logger implements AbrComponentAPI {
     private fragCurrent;
     private partCurrent;
     private bitrateTestDelay;
+    private rebufferNotice;
     bwEstimator: EwmaBandWidthEstimator;
     constructor(hls: Hls);
     resetEstimator(abrEwmaDefaultEstimate?: number): void;

package/dist/hls.js

@@ -1073,7 +1073,7 @@
       // Some browsers don't allow to use bind on console object anyway
       // fallback to default if needed
       try {
-        newLogger.log("Debug logs enabled for \"" + context + "\" in hls.js version " + "1.6.0-rc.2.0.canary.11081");
+        newLogger.log("Debug logs enabled for \"" + context + "\" in hls.js version " + "1.6.0");
       } catch (e) {
         /* log fn threw an exception. All logger methods are no-ops. */
         return createLogger();
@@ -3899,6 +3899,7 @@
       _this.fragCurrent = null;
       _this.partCurrent = null;
       _this.bitrateTestDelay = 0;
+      _this.rebufferNotice = -1;
       _this.bwEstimator = void 0;
       /*
           This method monitors the download rate of the current fragment, and will downswitch if that fragment will not load
@@ -4289,6 +4290,7 @@
       if (bufferStarvationDelay) {
         var _bestLevel = this.findBestLevel(avgbw, minAutoLevel, maxAutoLevel, bufferStarvationDelay, 0, bwFactor, bwUpFactor);
         if (_bestLevel >= 0) {
+          this.rebufferNotice = -1;
           return _bestLevel;
         }
       }
@@ -4311,7 +4313,10 @@
         }
       }
       var bestLevel = this.findBestLevel(avgbw, minAutoLevel, maxAutoLevel, bufferStarvationDelay, maxStarvationDelay, bwFactor, bwUpFactor);
-      this.info((bufferStarvationDelay ? 'rebuffering expected' : 'buffer is empty') + ", optimal quality level " + bestLevel);
+      if (this.rebufferNotice !== bestLevel) {
+        this.rebufferNotice = bestLevel;
+        this.info((bufferStarvationDelay ? 'rebuffering expected' : 'buffer is empty') + ", optimal quality level " + bestLevel);
+      }
       if (bestLevel > -1) {
         return bestLevel;
       }
@@ -9887,6 +9892,10 @@
         frag = this.getFragmentAtPosition(pos, end, levelDetails);
       }
       var programFrag = this.filterReplacedPrimary(frag, levelDetails);
+      if (!programFrag && frag) {
+        var curSNIdx = frag.sn - levelDetails.startSN;
+        programFrag = this.filterReplacedPrimary(fragments[curSNIdx + 1] || null, levelDetails);
+      }
       return this.mapToInitFragWhenRequired(programFrag);
     };
     _proto.isLoopLoading = function isLoopLoading(frag, targetBufferTime) {
@@ -16586,7 +16595,7 @@
     return !remuxResult.audio && !remuxResult.video && !remuxResult.text && !remuxResult.id3 && !remuxResult.initSegment;
   }
 
-  var version = "1.6.0-rc.2.0.canary.11081";
+  var version = "1.6.0";
 
   // ensure the worker ends up in the bundle
   // If the worker should not be included this gets aliased to empty.js
@@ -24080,7 +24089,7 @@
       return !playlists.some(function (playlistType) {
         var details = mediaSelection[playlistType].details;
         var playlistEnd = details.edge;
-        if (resumeTime > playlistEnd) {
+        if (resumeTime >= playlistEnd) {
           // Live playback - resumption segments are not yet available
           _this4.log("\"" + interstitial.identifier + "\" resumption " + resumeTime + " past " + playlistType + " playlist end " + playlistEnd);
           // Assume alignment is possible (or reset can take place)
@@ -25187,14 +25196,18 @@
 
     // Schedule buffer control
     ;
-    _proto.checkBuffer = function checkBuffer() {
+    _proto.checkBuffer = function checkBuffer(starved) {
       var items = this.schedule.items;
       if (!items) {
         return;
       }
       // Find when combined forward buffer change reaches next schedule segment
       var bufferInfo = BufferHelper.bufferInfo(this.primaryMedia, this.timelinePos, 0);
-      this.updateBufferedPos(bufferInfo.end, items, bufferInfo.len === 0);
+      if (starved) {
+        this.bufferedPos = this.timelinePos;
+      }
+      starved || (starved = bufferInfo.len < 1);
+      this.updateBufferedPos(bufferInfo.end, items, starved);
     };
     _proto.updateBufferedPos = function updateBufferedPos(bufferEnd, items, bufferIsEmpty) {
       var schedule = this.schedule;
@@ -25231,8 +25244,12 @@
             this.preloadAssets(nextItemToBuffer.event, 0);
           }
         }
-      } else if (bufferIsEmpty && playingItem && !this.itemsMatch(playingItem, bufferingItem) && bufferEndIndex === playingIndex) {
-        this.bufferedToItem(playingItem);
+      } else if (bufferIsEmpty && playingItem && !this.itemsMatch(playingItem, bufferingItem)) {
+        if (bufferEndIndex === playingIndex) {
+          this.bufferedToItem(playingItem);
+        } else if (bufferEndIndex === playingIndex + 1) {
+          this.bufferedToItem(items[bufferEndIndex]);
+        }
       }
     };
     _proto.assetsBuffered = function assetsBuffered(item, media) {
@@ -25347,7 +25364,11 @@
       if (neverLoaded) {
         var timelineStart = interstitial.timelineStart;
         if (interstitial.appendInPlace) {
-          this.flushFrontBuffer(timelineStart + 0.25);
+          var _playingItem$nextEven;
+          var playingItem = this.playingItem;
+          if (!this.isInterstitial(playingItem) && (playingItem == null ? void 0 : (_playingItem$nextEven = playingItem.nextEvent) == null ? void 0 : _playingItem$nextEven.identifier) === interstitial.identifier) {
+            this.flushFrontBuffer(timelineStart + 0.25);
+          }
         }
         var hlsStartOffset;
         var liveStartPosition = 0;
@@ -25391,6 +25412,7 @@
       if (!requiredTracks) {
         return;
       }
+      this.log("Removing front buffer starting at " + startOffset);
       var sourceBufferNames = Object.keys(requiredTracks);
       sourceBufferNames.forEach(function (type) {
         _this6.hls.trigger(Events.BUFFER_FLUSHING, {
@@ -25467,11 +25489,12 @@
           }
         }
       }
+      var assetId = assetItem.identifier;
       var playerConfig = _objectSpread2(_objectSpread2({}, userConfig), {}, {
         autoStartLoad: true,
         startFragPrefetch: true,
         primarySessionId: primary.sessionId,
-        assetPlayerId: assetItem.identifier,
+        assetPlayerId: assetId,
         abrEwmaDefaultEstimate: primary.bandwidthEstimate,
         interstitialsController: undefined,
         startPosition: startPosition,
@@ -25493,10 +25516,12 @@
           contentId: hash(assetItem.uri)
         });
       }
+      if (this.getAssetPlayer(assetId)) {
+        this.warn("Duplicate date range identifier " + interstitial + " and asset " + assetId);
+      }
       var player = new HlsAssetPlayer(this.HlsPlayerClass, playerConfig, interstitial, assetItem);
       this.playerQueue.push(player);
       interstitial.assetList[assetListIndex] = assetItem;
-      var assetId = assetItem.identifier;
       // Listen for LevelDetails and PTS change to update duration
       var updateAssetPlayerDetails = function updateAssetPlayerDetails(details) {
         if (details.live) {
@@ -25540,15 +25565,13 @@
         }
       };
       player.on(Events.BUFFER_CODECS, _onBufferCodecs);
-      var _bufferedToEnd = function bufferedToEnd(name) {
+      var bufferedToEnd = function bufferedToEnd() {
         var _this7$schedule$items;
         var inQueuPlayer = _this7.getAssetPlayer(assetId);
         _this7.log("buffered to end of asset " + inQueuPlayer);
         if (!inQueuPlayer) {
           return;
         }
-        inQueuPlayer.off(Events.BUFFERED_TO_END, _bufferedToEnd);
-
         // Preload at end of asset
         var scheduleIndex = _this7.schedule.findEventIndex(interstitial.identifier);
         var assetListIndex = interstitial.findAssetIndex(assetItem);
@@ -25556,7 +25579,7 @@
         var item = (_this7$schedule$items = _this7.schedule.items) == null ? void 0 : _this7$schedule$items[scheduleIndex];
         if (_this7.isInterstitial(item)) {
           if (assetListIndex !== -1 && !interstitial.isAssetPastPlayoutLimit(nextAssetIndex) && !interstitial.assetList[nextAssetIndex].error) {
-            _this7.bufferedToItem(item, assetListIndex + 1);
+            _this7.bufferedToItem(item, nextAssetIndex);
           } else {
             var _this7$schedule$items2;
             var nextItem = (_this7$schedule$items2 = _this7.schedule.items) == null ? void 0 : _this7$schedule$items2[scheduleIndex + 1];
@@ -25566,7 +25589,7 @@
           }
         }
       };
-      player.on(Events.BUFFERED_TO_END, _bufferedToEnd);
+      player.on(Events.BUFFERED_TO_END, bufferedToEnd);
       var endedWithAssetIndex = function endedWithAssetIndex(assetIndex) {
         return function () {
           var inQueuPlayer = _this7.getAssetPlayer(assetId);
@@ -25581,6 +25604,22 @@
       player.once(Events.MEDIA_ENDED, endedWithAssetIndex(assetListIndex));
       player.once(Events.PLAYOUT_LIMIT_REACHED, endedWithAssetIndex(Infinity));
       player.on(Events.ERROR, function (event, data) {
+        var inQueuPlayer = _this7.getAssetPlayer(assetId);
+        if (data.details === ErrorDetails.BUFFER_STALLED_ERROR) {
+          if (inQueuPlayer != null && inQueuPlayer.media) {
+            var assetCurrentTime = inQueuPlayer.currentTime;
+            var distanceFromEnd = inQueuPlayer.duration - assetCurrentTime;
+            if (assetCurrentTime && interstitial.appendInPlace && distanceFromEnd / inQueuPlayer.media.playbackRate < 0.5) {
+              _this7.log("Advancing buffer past end of asset " + assetId + " " + interstitial + " at " + inQueuPlayer.media.currentTime);
+              bufferedToEnd();
+            } else {
+              _this7.warn("Stalled at " + assetCurrentTime + " of " + (assetCurrentTime + distanceFromEnd) + " in asset " + assetId + " " + interstitial);
+              _this7.onTimeupdate();
+              _this7.checkBuffer(true);
+            }
+          }
+          return;
+        }
         _this7.handleAssetItemError(data, interstitial, _this7.schedule.findEventIndex(interstitial.identifier), assetListIndex, "Asset player error " + data.error + " " + interstitial);
       });
       player.on(Events.DESTROYING, function () {
@@ -25654,10 +25693,9 @@
           player: player
         });
       }
-      if (!player.bufferedInPlaceToEnd(media)) {
-        // detach media and attach to interstitial player if it does not have another element attached
-        this.bufferAssetPlayer(player, media);
-      }
+
+      // detach media and attach to interstitial player if it does not have another element attached
+      this.bufferAssetPlayer(player, media);
     };
     _proto.bufferAssetPlayer = function bufferAssetPlayer(player, media) {
       var _this$schedule$items2, _this$detachedData4;
@@ -25842,6 +25880,13 @@
             if (interstitial) {
               this.primaryFallback(interstitial);
             }
+            break;
+          }
+        case ErrorDetails.BUFFER_STALLED_ERROR:
+          {
+            this.onTimeupdate();
+            this.checkBuffer(true);
+            break;
           }
       }
     };

package/dist/hls.js.d.ts

@@ -19,6 +19,7 @@ export declare class AbrController extends Logger implements AbrComponentAPI {
     private fragCurrent;
     private partCurrent;
     private bitrateTestDelay;
+    private rebufferNotice;
     bwEstimator: EwmaBandWidthEstimator;
     constructor(hls: Hls);
     resetEstimator(abrEwmaDefaultEstimate?: number): void;