hls.js 1.6.0-beta.1.0.canary.10770 → 1.6.0-beta.1.0.canary.10773

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.10770"}`);
+      newLogger.log(`Debug logs enabled for "${context}" in hls.js version ${"1.6.0-beta.1.0.canary.10773"}`);
     } catch (e) {
       /* log fn threw an exception. All logger methods are no-ops. */
       return createLogger();
@@ -7146,7 +7146,7 @@ class M3U8Parser {
               break;
             }
           case 'DISCONTINUITY-SEQUENCE':
-            discontinuityCounter = parseInt(value1);
+            level.startCC = discontinuityCounter = parseInt(value1);
             break;
           case 'KEY':
             {
@@ -7276,7 +7276,7 @@ class M3U8Parser {
       if (!level.live) {
         lastFragment.endList = true;
       }
-      if (firstFragment) {
+      if (firstFragment && !level.startCC) {
         level.startCC = firstFragment.cc;
       }
       /**
@@ -7610,7 +7610,9 @@ function mergeDetails(oldDetails, newDetails) {
         newDetails.fragments.shift();
       }
       newDetails.startSN = newDetails.fragments[0].sn;
-      newDetails.startCC = newDetails.fragments[0].cc;
+      if (!newDetails.startCC) {
+        newDetails.startCC = newDetails.fragments[0].cc;
+      }
     } else {
       if (newDetails.canSkipDateRanges) {
         newDetails.dateRanges = mergeDateRanges(oldDetails.dateRanges, newDetails);
@@ -7875,11 +7877,10 @@ function adjustSlidingStart(sliding, details) {
  * The PTS of a fragment lets Hls.js know where it fits into a stream - by knowing every PTS, we know which fragment to
  * download at any given time. PTS is normally computed when the fragment is demuxed, so taking this step saves us time
  * and an extra download.
- * @param lastFrag
  * @param lastLevel
  * @param details
  */
-function alignStream(lastFrag, switchDetails, details) {
+function alignStream(switchDetails, details) {
   if (!switchDetails) {
     return;
   }
@@ -9096,12 +9097,9 @@ class BaseStreamController extends TaskLoop {
     const firstLevelLoad = !previousDetails;
     const aligned = details.alignedSliding && isFiniteNumber(slidingStart);
     if (firstLevelLoad || !aligned && !slidingStart) {
-      const {
-        fragPrevious
-      } = this;
-      alignStream(fragPrevious, switchDetails, details);
+      alignStream(switchDetails, details);
       const alignedSlidingStart = details.fragmentStart;
-      this.log(`Live playlist sliding: ${alignedSlidingStart.toFixed(2)} start-sn: ${previousDetails ? previousDetails.startSN : 'na'}->${details.startSN} prev-sn: ${fragPrevious ? fragPrevious.sn : 'na'} fragments: ${length}`);
+      this.log(`Live playlist sliding: ${alignedSlidingStart.toFixed(2)} start-sn: ${previousDetails ? previousDetails.startSN : 'na'}->${details.startSN} fragments: ${length}`);
       return alignedSlidingStart;
     }
     return slidingStart;
@@ -9803,7 +9801,7 @@ var eventemitter3 = {exports: {}};
 var eventemitter3Exports = eventemitter3.exports;
 var EventEmitter = /*@__PURE__*/getDefaultExportFromCjs(eventemitter3Exports);
 
-const version = "1.6.0-beta.1.0.canary.10770";
+const version = "1.6.0-beta.1.0.canary.10773";
 
 // ensure the worker ends up in the bundle
 // If the worker should not be included this gets aliased to empty.js
@@ -16248,7 +16246,7 @@ class AudioStreamController extends BaseStreamController {
               this.nextLoadPosition = this.findSyncFrag(videoAnchor).start;
               this.clearWaitingFragment();
             }
-          } else if (this.state !== State.STOPPED) {
+          } else {
             this.state = State.IDLE;
           }
         }
@@ -16438,17 +16436,14 @@ class AudioStreamController extends BaseStreamController {
   }
   onLevelLoaded(event, data) {
     this.mainDetails = data.details;
-    if (this.cachedTrackLoadedData !== null) {
-      this.hls.trigger(Events.AUDIO_TRACK_LOADED, this.cachedTrackLoadedData);
+    const cachedTrackLoadedData = this.cachedTrackLoadedData;
+    if (cachedTrackLoadedData) {
       this.cachedTrackLoadedData = null;
+      this.hls.trigger(Events.AUDIO_TRACK_LOADED, cachedTrackLoadedData);
     }
   }
   onAudioTrackLoaded(event, data) {
     var _track$details;
-    if (this.mainDetails == null) {
-      this.cachedTrackLoadedData = data;
-      return;
-    }
     const {
       levels
     } = this;
@@ -16456,6 +16451,13 @@ class AudioStreamController extends BaseStreamController {
       details: newDetails,
       id: trackId
     } = data;
+    if (this.mainDetails == null || this.mainDetails.expired || newDetails.endCC > this.mainDetails.endCC) {
+      this.cachedTrackLoadedData = data;
+      if (this.state !== State.STOPPED) {
+        this.state = State.WAITING_TRACK;
+      }
+      return;
+    }
     if (!levels) {
       this.warn(`Audio tracks were reset while loading level ${trackId}`);
       return;
@@ -16469,15 +16471,19 @@ class AudioStreamController extends BaseStreamController {
       if (newDetails.deltaUpdateFailed || !mainDetails) {
         return;
       }
-      if (!track.details && newDetails.hasProgramDateTime && mainDetails.hasProgramDateTime) {
-        // Make sure our audio rendition is aligned with the "main" rendition, using
-        // pdt as our reference times.
-        alignMediaPlaylistByPDT(newDetails, mainDetails);
-        sliding = newDetails.fragmentStart;
-      } else {
+      if (track.details) {
         var _this$levelLastLoaded;
         sliding = this.alignPlaylists(newDetails, track.details, (_this$levelLastLoaded = this.levelLastLoaded) == null ? void 0 : _this$levelLastLoaded.details);
       }
+      if (!newDetails.alignedSliding) {
+        // Align audio rendition with the "main" playlist on discontinuity change
+        // or program-date-time (PDT)
+        alignDiscontinuities(newDetails, mainDetails);
+        if (!newDetails.alignedSliding) {
+          alignMediaPlaylistByPDT(newDetails, mainDetails);
+        }
+        sliding = newDetails.fragmentStart;
+      }
     }
     track.details = newDetails;
     this.levelLastLoaded = track;
@@ -16556,7 +16562,9 @@ class AudioStreamController extends BaseStreamController {
         complete: false
       };
       cache.push(new Uint8Array(payload));
-      this.state = State.WAITING_INIT_PTS;
+      if (this.state !== State.STOPPED) {
+        this.state = State.WAITING_INIT_PTS;
+      }
     }
   }
   _handleFragmentLoadComplete(fragLoadedData) {