hls.js 1.6.3-0.canary.11252 → 1.6.3-0.canary.11254

package/dist/hls.d.mts

@@ -146,10 +146,10 @@ export declare class AudioStreamController extends BaseStreamController implemen
     protected registerListeners(): void;
     protected unregisterListeners(): void;
     onInitPtsFound(event: Events.INIT_PTS_FOUND, { frag, id, initPTS, timescale }: InitPTSFoundData): void;
-    private findSyncFrag;
+    protected getLoadPosition(): number;
+    private syncWithAnchor;
     startLoad(startPosition: number, skipSeekToStartPosition?: boolean): void;
     doTick(): void;
-    clearWaitingFragment(): void;
     protected resetLoadingState(): void;
     protected onTickEnd(): void;
     private doTickIdle;
@@ -367,7 +367,7 @@ export declare class BaseStreamController extends TaskLoop implements NetworkCom
     mapToInitFragWhenRequired(frag: Fragment | null): typeof frag;
     getNextPart(partList: Part[], frag: Fragment, targetBufferTime: number): number;
     private loadedEndOfParts;
-    protected getInitialLiveFragment(levelDetails: LevelDetails, fragments: MediaFragment[]): MediaFragment | null;
+    protected getInitialLiveFragment(levelDetails: LevelDetails): MediaFragment | null;
     protected getFragmentAtPosition(bufferEnd: number, end: number, levelDetails: LevelDetails): MediaFragment | null;
     protected alignPlaylists(details: LevelDetails, previousDetails: LevelDetails | undefined, switchDetails: LevelDetails | undefined): number;
     protected waitForCdnTuneIn(details: LevelDetails): boolean | 0;
@@ -2006,6 +2006,7 @@ export declare type HlsConfig = {
     ignoreDevicePixelRatio: boolean;
     maxDevicePixelRatio: number;
     preferManagedMediaSource: boolean;
+    preserveManualLevelOnError: boolean;
     timelineOffset?: number;
     ignorePlaylistParsingErrors: boolean;
     loader: {

package/dist/hls.d.ts

@@ -146,10 +146,10 @@ export declare class AudioStreamController extends BaseStreamController implemen
     protected registerListeners(): void;
     protected unregisterListeners(): void;
     onInitPtsFound(event: Events.INIT_PTS_FOUND, { frag, id, initPTS, timescale }: InitPTSFoundData): void;
-    private findSyncFrag;
+    protected getLoadPosition(): number;
+    private syncWithAnchor;
     startLoad(startPosition: number, skipSeekToStartPosition?: boolean): void;
     doTick(): void;
-    clearWaitingFragment(): void;
     protected resetLoadingState(): void;
     protected onTickEnd(): void;
     private doTickIdle;
@@ -367,7 +367,7 @@ export declare class BaseStreamController extends TaskLoop implements NetworkCom
     mapToInitFragWhenRequired(frag: Fragment | null): typeof frag;
     getNextPart(partList: Part[], frag: Fragment, targetBufferTime: number): number;
     private loadedEndOfParts;
-    protected getInitialLiveFragment(levelDetails: LevelDetails, fragments: MediaFragment[]): MediaFragment | null;
+    protected getInitialLiveFragment(levelDetails: LevelDetails): MediaFragment | null;
     protected getFragmentAtPosition(bufferEnd: number, end: number, levelDetails: LevelDetails): MediaFragment | null;
     protected alignPlaylists(details: LevelDetails, previousDetails: LevelDetails | undefined, switchDetails: LevelDetails | undefined): number;
     protected waitForCdnTuneIn(details: LevelDetails): boolean | 0;
@@ -2006,6 +2006,7 @@ export declare type HlsConfig = {
     ignoreDevicePixelRatio: boolean;
     maxDevicePixelRatio: number;
     preferManagedMediaSource: boolean;
+    preserveManualLevelOnError: boolean;
     timelineOffset?: number;
     ignorePlaylistParsingErrors: boolean;
     loader: {

package/dist/hls.js

@@ -1165,7 +1165,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.3-0.canary.11252");
+        newLogger.log("Debug logs enabled for \"" + context + "\" in hls.js version " + "1.6.3-0.canary.11254");
       } catch (e) {
         /* log fn threw an exception. All logger methods are no-ops. */
         return createLogger();
@@ -4695,7 +4695,6 @@
     if (PDTValue >= (endPDT || 0)) {
       return null;
     }
-    maxFragLookUpTolerance = maxFragLookUpTolerance || 0;
     for (var seg = 0; seg < fragments.length; ++seg) {
       var frag = fragments[seg];
       if (pdtWithinToleranceTest(PDTValue, maxFragLookUpTolerance, frag)) {
@@ -4821,38 +4820,32 @@
     var endProgramDateTime = candidate.endProgramDateTime || 0;
     return endProgramDateTime - candidateLookupTolerance > pdtBufferEnd;
   }
-  function findFragWithCC(fragments, cc) {
-    return BinarySearch.search(fragments, function (candidate) {
-      if (candidate.cc < cc) {
-        return 1;
-      } else if (candidate.cc > cc) {
-        return -1;
-      } else {
-        return 0;
-      }
-    });
-  }
-  function findNearestWithCC(details, cc, fragment) {
+  function findNearestWithCC(details, cc, pos) {
     if (details) {
       if (details.startCC <= cc && details.endCC >= cc) {
-        var start = fragment.start;
-        var end = fragment.end;
         var fragments = details.fragments;
-        if (!fragment.relurl) {
-          var fragmentHint = details.fragmentHint;
-          if (fragmentHint) {
-            fragments = fragments.concat(fragmentHint);
-          }
+        var fragmentHint = details.fragmentHint;
+        if (fragmentHint) {
+          fragments = fragments.concat(fragmentHint);
         }
-        return BinarySearch.search(fragments, function (candidate) {
-          if (candidate.cc < cc || candidate.end <= start) {
+        var closest;
+        BinarySearch.search(fragments, function (candidate) {
+          if (candidate.cc < cc) {
             return 1;
-          } else if (candidate.cc > cc || candidate.start >= end) {
+          }
+          if (candidate.cc > cc) {
             return -1;
-          } else {
-            return 0;
           }
+          closest = candidate;
+          if (candidate.end <= pos) {
+            return 1;
+          }
+          if (candidate.start > pos) {
+            return -1;
+          }
+          return 0;
         });
+        return closest || null;
       }
     }
     return null;
@@ -5142,7 +5135,7 @@
           loadLevel = hls.loadLevel,
           minAutoLevel = hls.minAutoLevel,
           maxAutoLevel = hls.maxAutoLevel;
-        if (!hls.autoLevelEnabled) {
+        if (!hls.autoLevelEnabled && !hls.config.preserveManualLevelOnError) {
           hls.loadLevel = -1;
         }
         var fragErrorType = (_data$frag2 = data.frag) == null ? void 0 : _data$frag2.type;
@@ -9969,7 +9962,7 @@
             this.log("LL-Part loading ON for initial live fragment");
             this.loadingParts = true;
           }
-          frag = this.getInitialLiveFragment(levelDetails, fragments);
+          frag = this.getInitialLiveFragment(levelDetails);
           var mainStart = this.hls.startPosition;
           var liveSyncPosition = this.hls.liveSyncPosition;
           var startPosition = frag ? (mainStart !== -1 && mainStart >= start ? mainStart : liveSyncPosition) || frag.start : pos;
@@ -10099,7 +10092,8 @@
      "sliding" of the playlist, which is its offset from the start of playback. After sliding we can compute the real
      start and end times for each fragment in the playlist (after which this method will not need to be called).
     */;
-    _proto.getInitialLiveFragment = function getInitialLiveFragment(levelDetails, fragments) {
+    _proto.getInitialLiveFragment = function getInitialLiveFragment(levelDetails) {
+      var fragments = levelDetails.fragments;
       var fragPrevious = this.fragPrevious;
       var frag = null;
       if (fragPrevious) {
@@ -10122,7 +10116,7 @@
           // It's important to stay within the continuity range if available; otherwise the fragments in the playlist
           // will have the wrong start times
           if (!frag) {
-            frag = findFragWithCC(fragments, fragPrevious.cc);
+            frag = findNearestWithCC(levelDetails, fragPrevious.cc, fragPrevious.end);
             if (frag) {
               this.log("Live playlist, switching playlist, load frag with same CC: " + frag.sn);
             }
@@ -16677,7 +16671,7 @@
     return !remuxResult.audio && !remuxResult.video && !remuxResult.text && !remuxResult.id3 && !remuxResult.initSegment;
   }
 
-  var version = "1.6.3-0.canary.11252";
+  var version = "1.6.3-0.canary.11254";
 
   // ensure the worker ends up in the bundle
   // If the worker should not be included this gets aliased to empty.js
@@ -17133,23 +17127,46 @@
         if (this.state === State.WAITING_INIT_PTS) {
           var waitingData = this.waitingData;
           if (!waitingData && !this.loadingParts || waitingData && waitingData.frag.cc !== cc) {
-            this.nextLoadPosition = this.findSyncFrag(frag).start;
+            this.syncWithAnchor(frag, waitingData == null ? void 0 : waitingData.frag);
           }
-          this.tick();
         } else if (!this.hls.hasEnoughToStart && inFlightFrag && inFlightFrag.cc !== cc) {
-          this.startFragRequested = false;
-          this.nextLoadPosition = this.findSyncFrag(frag).start;
           inFlightFrag.abortRequests();
-          this.resetLoadingState();
+          this.syncWithAnchor(frag, inFlightFrag);
         } else if (this.state === State.IDLE) {
           this.tick();
         }
       }
     };
-    _proto.findSyncFrag = function findSyncFrag(mainFrag) {
+    _proto.getLoadPosition = function getLoadPosition() {
+      if (!this.startFragRequested && this.nextLoadPosition >= 0) {
+        return this.nextLoadPosition;
+      }
+      return _BaseStreamController.prototype.getLoadPosition.call(this);
+    };
+    _proto.syncWithAnchor = function syncWithAnchor(mainAnchor, waitingToAppend) {
+      var _this$mainFragLoading;
+      // Drop waiting fragment if videoTrackCC has changed since waitingFragment was set and initPTS was not found
+      var mainFragLoading = ((_this$mainFragLoading = this.mainFragLoading) == null ? void 0 : _this$mainFragLoading.frag) || null;
+      if (waitingToAppend) {
+        if ((mainFragLoading == null ? void 0 : mainFragLoading.cc) === waitingToAppend.cc) {
+          // Wait for loading frag to complete and INIT_PTS_FOUND
+          return;
+        }
+      }
+      var targetDiscontinuity = (mainFragLoading || mainAnchor).cc;
       var trackDetails = this.getLevelDetails();
-      var cc = mainFrag.cc;
-      return findNearestWithCC(trackDetails, cc, mainFrag) || trackDetails && findFragWithCC(trackDetails.fragments, cc) || mainFrag;
+      var pos = this.getLoadPosition();
+      var syncFrag = findNearestWithCC(trackDetails, targetDiscontinuity, pos);
+      // Only stop waiting for audioFrag.cc if an audio segment of the same discontinuity domain (cc) is found
+      if (syncFrag) {
+        this.log("Waiting fragment cc (" + (waitingToAppend == null ? void 0 : waitingToAppend.cc) + ") cancelled because video is at cc " + mainAnchor.cc);
+        this.startFragRequested = false;
+        this.nextLoadPosition = syncFrag.start;
+        this.resetLoadingState();
+        if (this.state === State.IDLE) {
+          this.doTickIdle();
+        }
+      }
     };
     _proto.startLoad = function startLoad(startPosition, skipSeekToStartPosition) {
       if (!this.levels) {
@@ -17230,10 +17247,7 @@
                   _BaseStreamController.prototype._handleFragmentLoadComplete.call(this, data);
                 }
               } else if (mainAnchor && mainAnchor.cc !== waitingData.frag.cc) {
-                // Drop waiting fragment if videoTrackCC has changed since waitingFragment was set and initPTS was not found
-                this.log("Waiting fragment cc (" + frag.cc + ") cancelled because video is at cc " + mainAnchor.cc);
-                this.nextLoadPosition = this.findSyncFrag(mainAnchor).start;
-                this.clearWaitingFragment();
+                this.syncWithAnchor(mainAnchor, waitingData.frag);
               }
             } else {
               this.state = State.IDLE;
@@ -17242,22 +17256,12 @@
       }
       this.onTickEnd();
     };
-    _proto.clearWaitingFragment = function clearWaitingFragment() {
+    _proto.resetLoadingState = function resetLoadingState() {
       var waitingData = this.waitingData;
       if (waitingData) {
-        if (!this.hls.hasEnoughToStart) {
-          // Load overlapping fragment on start when discontinuity start times are not aligned
-          this.startFragRequested = false;
-        }
         this.fragmentTracker.removeFragment(waitingData.frag);
         this.waitingData = null;
-        if (this.state !== State.STOPPED) {
-          this.state = State.IDLE;
-        }
       }
-    };
-    _proto.resetLoadingState = function resetLoadingState() {
-      this.clearWaitingFragment();
       _BaseStreamController.prototype.resetLoadingState.call(this);
     };
     _proto.onTickEnd = function onTickEnd() {
@@ -17269,7 +17273,7 @@
       this.lastCurrentTime = media.currentTime;
     };
     _proto.doTickIdle = function doTickIdle() {
-      var _this$mainFragLoading;
+      var _this$mainFragLoading2;
       var hls = this.hls,
         levels = this.levels,
         media = this.media,
@@ -17341,7 +17345,7 @@
       }
 
       // Request audio segments up to one fragment ahead of main stream-controller
-      var mainFragLoading = ((_this$mainFragLoading = this.mainFragLoading) == null ? void 0 : _this$mainFragLoading.frag) || null;
+      var mainFragLoading = ((_this$mainFragLoading2 = this.mainFragLoading) == null ? void 0 : _this$mainFragLoading2.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;
@@ -25959,7 +25963,6 @@
       var _this$schedule$items2, _this$detachedData4;
       var interstitial = player.interstitial,
         assetItem = player.assetItem;
-        player.assetId;
       var scheduleIndex = this.schedule.findEventIndex(interstitial.identifier);
       var item = (_this$schedule$items2 = this.schedule.items) == null ? void 0 : _this$schedule$items2[scheduleIndex];
       if (!item) {
@@ -31217,6 +31220,7 @@
     interstitialAppendInPlace: true,
     interstitialLiveLookAhead: 10,
     useMediaCapabilities: true,
+    preserveManualLevelOnError: false,
     certLoadPolicy: {
       default: defaultLoadPolicy
     },

package/dist/hls.js.d.ts

@@ -146,10 +146,10 @@ export declare class AudioStreamController extends BaseStreamController implemen
     protected registerListeners(): void;
     protected unregisterListeners(): void;
     onInitPtsFound(event: Events.INIT_PTS_FOUND, { frag, id, initPTS, timescale }: InitPTSFoundData): void;
-    private findSyncFrag;
+    protected getLoadPosition(): number;
+    private syncWithAnchor;
     startLoad(startPosition: number, skipSeekToStartPosition?: boolean): void;
     doTick(): void;
-    clearWaitingFragment(): void;
     protected resetLoadingState(): void;
     protected onTickEnd(): void;
     private doTickIdle;
@@ -367,7 +367,7 @@ export declare class BaseStreamController extends TaskLoop implements NetworkCom
     mapToInitFragWhenRequired(frag: Fragment | null): typeof frag;
     getNextPart(partList: Part[], frag: Fragment, targetBufferTime: number): number;
     private loadedEndOfParts;
-    protected getInitialLiveFragment(levelDetails: LevelDetails, fragments: MediaFragment[]): MediaFragment | null;
+    protected getInitialLiveFragment(levelDetails: LevelDetails): MediaFragment | null;
     protected getFragmentAtPosition(bufferEnd: number, end: number, levelDetails: LevelDetails): MediaFragment | null;
     protected alignPlaylists(details: LevelDetails, previousDetails: LevelDetails | undefined, switchDetails: LevelDetails | undefined): number;
     protected waitForCdnTuneIn(details: LevelDetails): boolean | 0;
@@ -2006,6 +2006,7 @@ export declare type HlsConfig = {
     ignoreDevicePixelRatio: boolean;
     maxDevicePixelRatio: number;
     preferManagedMediaSource: boolean;
+    preserveManualLevelOnError: boolean;
     timelineOffset?: number;
     ignorePlaylistParsingErrors: boolean;
     loader: {