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

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-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();
@@ -3272,6 +3272,7 @@ class AbrController extends Logger {
     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
@@ -3737,6 +3738,7 @@ class AbrController extends Logger {
     if (bufferStarvationDelay) {
       const _bestLevel = this.findBestLevel(avgbw, minAutoLevel, maxAutoLevel, bufferStarvationDelay, 0, bwFactor, bwUpFactor);
       if (_bestLevel >= 0) {
+        this.rebufferNotice = -1;
         return _bestLevel;
       }
     }
@@ -3759,7 +3761,10 @@ class AbrController extends Logger {
       }
     }
     const 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;
     }
@@ -9156,7 +9161,11 @@ class BaseStreamController extends TaskLoop {
       const end = this.loadingParts ? levelDetails.partEnd : levelDetails.fragmentEnd;
       frag = this.getFragmentAtPosition(pos, end, levelDetails);
     }
-    const programFrag = this.filterReplacedPrimary(frag, levelDetails);
+    let programFrag = this.filterReplacedPrimary(frag, levelDetails);
+    if (!programFrag && frag) {
+      const curSNIdx = frag.sn - levelDetails.startSN;
+      programFrag = this.filterReplacedPrimary(fragments[curSNIdx + 1] || null, levelDetails);
+    }
     return this.mapToInitFragWhenRequired(programFrag);
   }
   isLoopLoading(frag, targetBufferTime) {
@@ -10108,7 +10117,7 @@ function requireEventemitter3 () {
 var eventemitter3Exports = requireEventemitter3();
 var EventEmitter = /*@__PURE__*/getDefaultExportFromCjs(eventemitter3Exports);
 
-const version = "1.6.0-rc.2.0.canary.11081";
+const 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
@@ -23888,7 +23897,7 @@ class InterstitialsSchedule extends Logger {
     return !playlists.some(playlistType => {
       const details = mediaSelection[playlistType].details;
       const playlistEnd = details.edge;
-      if (resumeTime > playlistEnd) {
+      if (resumeTime >= playlistEnd) {
         // Live playback - resumption segments are not yet available
         this.log(`"${interstitial.identifier}" resumption ${resumeTime} past ${playlistType} playlist end ${playlistEnd}`);
         // Assume alignment is possible (or reset can take place)
@@ -25283,14 +25292,18 @@ Schedule: ${scheduleItems.map(seg => segmentToString(seg))}`);
   }
 
   // Schedule buffer control
-  checkBuffer() {
+  checkBuffer(starved) {
     const items = this.schedule.items;
     if (!items) {
       return;
     }
     // Find when combined forward buffer change reaches next schedule segment
     const 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);
   }
   updateBufferedPos(bufferEnd, items, bufferIsEmpty) {
     const schedule = this.schedule;
@@ -25327,8 +25340,12 @@ Schedule: ${scheduleItems.map(seg => segmentToString(seg))}`);
           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]);
+      }
     }
   }
   assetsBuffered(item, media) {
@@ -25438,7 +25455,11 @@ Schedule: ${scheduleItems.map(seg => segmentToString(seg))}`);
     if (neverLoaded) {
       const timelineStart = interstitial.timelineStart;
       if (interstitial.appendInPlace) {
-        this.flushFrontBuffer(timelineStart + 0.25);
+        var _playingItem$nextEven;
+        const 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);
+        }
       }
       let hlsStartOffset;
       let liveStartPosition = 0;
@@ -25481,6 +25502,7 @@ Schedule: ${scheduleItems.map(seg => segmentToString(seg))}`);
     if (!requiredTracks) {
       return;
     }
+    this.log(`Removing front buffer starting at ${startOffset}`);
     const sourceBufferNames = Object.keys(requiredTracks);
     sourceBufferNames.forEach(type => {
       this.hls.trigger(Events.BUFFER_FLUSHING, {
@@ -25557,11 +25579,12 @@ Schedule: ${scheduleItems.map(seg => segmentToString(seg))}`);
         }
       }
     }
+    const assetId = assetItem.identifier;
     const playerConfig = _objectSpread2(_objectSpread2({}, userConfig), {}, {
       autoStartLoad: true,
       startFragPrefetch: true,
       primarySessionId: primary.sessionId,
-      assetPlayerId: assetItem.identifier,
+      assetPlayerId: assetId,
       abrEwmaDefaultEstimate: primary.bandwidthEstimate,
       interstitialsController: undefined,
       startPosition,
@@ -25583,10 +25606,12 @@ Schedule: ${scheduleItems.map(seg => segmentToString(seg))}`);
         contentId: hash(assetItem.uri)
       });
     }
+    if (this.getAssetPlayer(assetId)) {
+      this.warn(`Duplicate date range identifier ${interstitial} and asset ${assetId}`);
+    }
     const player = new HlsAssetPlayer(this.HlsPlayerClass, playerConfig, interstitial, assetItem);
     this.playerQueue.push(player);
     interstitial.assetList[assetListIndex] = assetItem;
-    const assetId = assetItem.identifier;
     // Listen for LevelDetails and PTS change to update duration
     const updateAssetPlayerDetails = details => {
       if (details.live) {
@@ -25628,15 +25653,13 @@ Schedule: ${scheduleItems.map(seg => segmentToString(seg))}`);
       }
     };
     player.on(Events.BUFFER_CODECS, onBufferCodecs);
-    const bufferedToEnd = name => {
+    const bufferedToEnd = () => {
       var _this$schedule$items2;
       const inQueuPlayer = this.getAssetPlayer(assetId);
       this.log(`buffered to end of asset ${inQueuPlayer}`);
       if (!inQueuPlayer) {
         return;
       }
-      inQueuPlayer.off(Events.BUFFERED_TO_END, bufferedToEnd);
-
       // Preload at end of asset
       const scheduleIndex = this.schedule.findEventIndex(interstitial.identifier);
       const assetListIndex = interstitial.findAssetIndex(assetItem);
@@ -25644,7 +25667,7 @@ Schedule: ${scheduleItems.map(seg => segmentToString(seg))}`);
       const item = (_this$schedule$items2 = this.schedule.items) == null ? void 0 : _this$schedule$items2[scheduleIndex];
       if (this.isInterstitial(item)) {
         if (assetListIndex !== -1 && !interstitial.isAssetPastPlayoutLimit(nextAssetIndex) && !interstitial.assetList[nextAssetIndex].error) {
-          this.bufferedToItem(item, assetListIndex + 1);
+          this.bufferedToItem(item, nextAssetIndex);
         } else {
           var _this$schedule$items3;
           const nextItem = (_this$schedule$items3 = this.schedule.items) == null ? void 0 : _this$schedule$items3[scheduleIndex + 1];
@@ -25669,6 +25692,22 @@ Schedule: ${scheduleItems.map(seg => segmentToString(seg))}`);
     player.once(Events.MEDIA_ENDED, endedWithAssetIndex(assetListIndex));
     player.once(Events.PLAYOUT_LIMIT_REACHED, endedWithAssetIndex(Infinity));
     player.on(Events.ERROR, (event, data) => {
+      const inQueuPlayer = this.getAssetPlayer(assetId);
+      if (data.details === ErrorDetails.BUFFER_STALLED_ERROR) {
+        if (inQueuPlayer != null && inQueuPlayer.media) {
+          const assetCurrentTime = inQueuPlayer.currentTime;
+          const distanceFromEnd = inQueuPlayer.duration - assetCurrentTime;
+          if (assetCurrentTime && interstitial.appendInPlace && distanceFromEnd / inQueuPlayer.media.playbackRate < 0.5) {
+            this.log(`Advancing buffer past end of asset ${assetId} ${interstitial} at ${inQueuPlayer.media.currentTime}`);
+            bufferedToEnd();
+          } else {
+            this.warn(`Stalled at ${assetCurrentTime} of ${assetCurrentTime + distanceFromEnd} in asset ${assetId} ${interstitial}`);
+            this.onTimeupdate();
+            this.checkBuffer(true);
+          }
+        }
+        return;
+      }
       this.handleAssetItemError(data, interstitial, this.schedule.findEventIndex(interstitial.identifier), assetListIndex, `Asset player error ${data.error} ${interstitial}`);
     });
     player.on(Events.DESTROYING, () => {
@@ -25743,10 +25782,9 @@ Schedule: ${scheduleItems.map(seg => segmentToString(seg))}`);
         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);
   }
   bufferAssetPlayer(player, media) {
     var _this$schedule$items4, _this$detachedData5;
@@ -25929,6 +25967,13 @@ Schedule: ${scheduleItems.map(seg => segmentToString(seg))}`);
           if (interstitial) {
             this.primaryFallback(interstitial);
           }
+          break;
+        }
+      case ErrorDetails.BUFFER_STALLED_ERROR:
+        {
+          this.onTimeupdate();
+          this.checkBuffer(true);
+          break;
         }
     }
   }
@@ -35098,5 +35143,5 @@ class Hls {
 }
 Hls.defaultConfig = void 0;
 
-export { AbrController, AttrList, AudioStreamController, AudioTrackController, BasePlaylistController, BaseSegment, BaseStreamController, BufferController, CMCDController, CapLevelController, ChunkMetadata, ContentSteeringController, Cues, DateRange, EMEController, ErrorActionFlags, ErrorController, ErrorDetails, ErrorTypes, Events, FPSController, FetchLoader, Fragment, Hls, HlsSkip, HlsUrlParameters, KeySystemFormats, KeySystems, Level, LevelDetails, LevelKey, LoadStats, MetadataSchema, NetworkErrorAction, Part, PlaylistLevelType, SubtitleStreamController, SubtitleTrackController, TimelineController, XhrLoader, Hls as default, fetchSupported, getMediaSource, isMSESupported, isSupported, requestMediaKeySystemAccess };
+export { AbrController, AttrList, AudioStreamController, AudioTrackController, BasePlaylistController, BaseSegment, BaseStreamController, BufferController, CMCDController, CapLevelController, ChunkMetadata, ContentSteeringController, Cues, DateRange, EMEController, ErrorActionFlags, ErrorController, ErrorDetails, ErrorTypes, Events, FPSController, FetchLoader, Fragment, Hls, HlsSkip, HlsUrlParameters, KeySystemFormats, KeySystems, Level, LevelDetails, LevelKey, LoadStats, M3U8Parser, MetadataSchema, NetworkErrorAction, Part, PlaylistLevelType, SubtitleStreamController, SubtitleTrackController, TimelineController, XhrLoader, Hls as default, fetchSupported, getMediaSource, isMSESupported, isSupported, requestMediaKeySystemAccess };
 //# sourceMappingURL=hls.mjs.map