hls.js 1.6.0-beta.1.0.canary.10786 → 1.6.0-beta.1.0.canary.10788

package/dist/hls.mjs

@@ -400,7 +400,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.1.0.canary.10786"}`);
+      newLogger.log(`Debug logs enabled for "${context}" in hls.js version ${"1.6.0-beta.1.0.canary.10788"}`);
     } catch (e) {
       /* log fn threw an exception. All logger methods are no-ops. */
       return createLogger();
@@ -7748,12 +7748,14 @@ function adjustSliding(oldDetails, newDetails, matchingStableVariantOrRendition
   let sliding = 0;
   if (advancedOrStable && delta < oldFragments.length) {
     sliding = oldFragments[delta].start;
+  } else if (advancedOrStable && newDetails.startSN === oldDetails.endSN + 1) {
+    sliding = oldDetails.fragmentEnd;
   } else if (advancedOrStable && matchingStableVariantOrRendition) {
-    // align new start with old end (updated playlist start sequence is past end sequence of last update)
-    sliding = oldDetails.edge;
-  } else if (!newDetails.skippedSegments && newDetails.fragments[0].start === 0) {
+    // align with expected position (updated playlist start sequence is past end sequence of last update)
+    sliding = oldDetails.fragmentStart + delta * newDetails.levelTargetDuration;
+  } else if (!newDetails.skippedSegments && newDetails.fragmentStart === 0) {
     // align new start with old (playlist switch has a sequence with no overlap and should not be used for alignment)
-    sliding = oldDetails.fragments[0].start;
+    sliding = oldDetails.fragmentStart;
   } else {
     // new details already has a sliding offset or has skipped segments
     return;
@@ -9806,7 +9808,7 @@ var eventemitter3 = {exports: {}};
 var eventemitter3Exports = eventemitter3.exports;
 var EventEmitter = /*@__PURE__*/getDefaultExportFromCjs(eventemitter3Exports);
 
-const version = "1.6.0-beta.1.0.canary.10786";
+const version = "1.6.0-beta.1.0.canary.10788";
 
 // ensure the worker ends up in the bundle
 // If the worker should not be included this gets aliased to empty.js
@@ -16065,8 +16067,9 @@ const TICK_INTERVAL$2 = 100; // how often to tick in ms
 class AudioStreamController extends BaseStreamController {
   constructor(hls, fragmentTracker, keyLoader) {
     super(hls, fragmentTracker, keyLoader, 'audio-stream-controller', PlaylistLevelType.AUDIO);
-    this.videoAnchor = null;
+    this.mainAnchor = null;
     this.mainFragLoading = null;
+    this.audioOnly = false;
     this.bufferedTrack = null;
     this.switchingTrack = null;
     this.trackId = -1;
@@ -16080,9 +16083,10 @@ class AudioStreamController extends BaseStreamController {
   onHandlerDestroying() {
     this.unregisterListeners();
     super.onHandlerDestroying();
-    this.mainDetails = null;
-    this.bufferedTrack = null;
-    this.switchingTrack = null;
+    this.resetItem();
+  }
+  resetItem() {
+    this.mainDetails = this.mainAnchor = this.mainFragLoading = this.bufferedTrack = this.switchingTrack = this.waitingData = this.cachedTrackLoadedData = null;
   }
   registerListeners() {
     super.registerListeners();
@@ -16139,7 +16143,7 @@ class AudioStreamController extends BaseStreamController {
         timescale
       };
       this.log(`InitPTS for cc: ${cc} found from main: ${initPTS}/${timescale}`);
-      this.videoAnchor = frag;
+      this.mainAnchor = frag;
       // If we are waiting, tick immediately to unblock audio fragment transmuxing
       if (this.state === State.WAITING_INIT_PTS) {
         const waitingData = this.waitingData;
@@ -16230,7 +16234,7 @@ class AudioStreamController extends BaseStreamController {
               cache,
               complete
             } = waitingData;
-            const videoAnchor = this.videoAnchor;
+            const mainAnchor = this.mainAnchor;
             if (this.initPTS[frag.cc] !== undefined) {
               this.waitingData = null;
               this.state = State.FRAG_LOADING;
@@ -16245,10 +16249,10 @@ class AudioStreamController extends BaseStreamController {
               if (complete) {
                 super._handleFragmentLoadComplete(data);
               }
-            } else if (videoAnchor && videoAnchor.cc !== waitingData.frag.cc) {
+            } 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 ${videoAnchor.cc}`);
-              this.nextLoadPosition = this.findSyncFrag(videoAnchor).start;
+              this.log(`Waiting fragment cc (${frag.cc}) cancelled because video is at cc ${mainAnchor.cc}`);
+              this.nextLoadPosition = this.findSyncFrag(mainAnchor).start;
               this.clearWaitingFragment();
             }
           } else {
@@ -16370,7 +16374,7 @@ class AudioStreamController extends BaseStreamController {
 
     // Request audio segments up to one fragment ahead of main stream-controller
     const mainFragLoading = (_this$mainFragLoading = this.mainFragLoading) == null ? void 0 : _this$mainFragLoading.frag;
-    if (this.startFragRequested && mainFragLoading && isMediaFragment(mainFragLoading) && isMediaFragment(frag) && !frag.endList && (!trackDetails.live || !this.loadingParts && targetBufferTime < this.hls.liveSyncPosition)) {
+    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)
@@ -16435,8 +16439,8 @@ class AudioStreamController extends BaseStreamController {
   }
   onManifestLoading() {
     super.onManifestLoading();
-    this.bufferFlushed = this.flushing = false;
-    this.mainDetails = this.waitingData = this.videoAnchor = this.bufferedTrack = this.cachedTrackLoadedData = this.switchingTrack = null;
+    this.bufferFlushed = this.flushing = this.audioOnly = false;
+    this.resetItem();
     this.trackId = -1;
   }
   onLevelLoaded(event, data) {
@@ -16456,7 +16460,8 @@ class AudioStreamController extends BaseStreamController {
       details: newDetails,
       id: trackId
     } = data;
-    if (this.mainDetails == null || this.mainDetails.expired || newDetails.endCC > this.mainDetails.endCC) {
+    const mainDetails = this.mainDetails;
+    if (!mainDetails || mainDetails.expired || newDetails.endCC > mainDetails.endCC) {
       this.cachedTrackLoadedData = data;
       if (this.state !== State.STOPPED) {
         this.state = State.WAITING_TRACK;
@@ -16472,8 +16477,7 @@ class AudioStreamController extends BaseStreamController {
     let sliding = 0;
     if (newDetails.live || (_track$details = track.details) != null && _track$details.live) {
       this.checkLiveUpdate(newDetails);
-      const mainDetails = this.mainDetails;
-      if (newDetails.deltaUpdateFailed || !mainDetails) {
+      if (newDetails.deltaUpdateFailed) {
         return;
       }
       if (track.details) {
@@ -16494,8 +16498,8 @@ class AudioStreamController extends BaseStreamController {
     this.levelLastLoaded = track;
 
     // compute start position if we are aligned with the main playlist
-    if (!this.startFragRequested && (this.mainDetails || !newDetails.live)) {
-      this.setStartPosition(this.mainDetails || newDetails, sliding);
+    if (!this.startFragRequested) {
+      this.setStartPosition(mainDetails, sliding);
     }
     this.hls.trigger(Events.AUDIO_TRACK_UPDATED, {
       details: newDetails,
@@ -16592,7 +16596,7 @@ class AudioStreamController extends BaseStreamController {
     }
   }
   onFragLoading(event, data) {
-    if (data.frag.type === PlaylistLevelType.MAIN && isMediaFragment(data.frag)) {
+    if (!this.audioOnly && data.frag.type === PlaylistLevelType.MAIN && isMediaFragment(data.frag)) {
       this.mainFragLoading = data;
       if (this.state === State.IDLE) {
         this.tick();
@@ -16605,6 +16609,10 @@ class AudioStreamController extends BaseStreamController {
       part
     } = data;
     if (frag.type !== PlaylistLevelType.AUDIO) {
+      if (!this.audioOnly && frag.type === PlaylistLevelType.MAIN && !frag.elementaryStreams.video && !frag.elementaryStreams.audiovideo) {
+        this.audioOnly = true;
+        this.mainFragLoading = null;
+      }
       return;
     }
     if (this.fragContextChanged(frag)) {