hls.js 1.6.0-beta.2.0.canary.10846 → 1.6.0-beta.2.0.canary.10851

package/dist/hls.mjs

@@ -401,7 +401,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.2.0.canary.10846"}`);
+      newLogger.log(`Debug logs enabled for "${context}" in hls.js version ${"1.6.0-beta.2.0.canary.10851"}`);
     } catch (e) {
       /* log fn threw an exception. All logger methods are no-ops. */
       return createLogger();
@@ -6426,7 +6426,7 @@ class LevelDetails {
     return this.endSN;
   }
   get expired() {
-    if (this.live && this.age) {
+    if (this.live && this.age && this.misses < 3) {
       const playlistWindowDuration = this.partEnd - this.fragmentStart;
       return this.age > Math.max(playlistWindowDuration, this.totalduration) + this.levelTargetDuration;
     }
@@ -7568,6 +7568,9 @@ function updateFragPTSDTS(details, frag, startPTS, endPTS, startDTS, endDTS) {
   return drift;
 }
 function mergeDetails(oldDetails, newDetails) {
+  if (oldDetails === newDetails) {
+    return;
+  }
   // Track the last initSegment processed. Initialize it to the last one on the timeline.
   let currentInitSegment = null;
   const oldFragments = oldDetails.fragments;
@@ -8947,7 +8950,7 @@ class BaseStreamController extends TaskLoop {
         frag = this.getInitialLiveFragment(levelDetails, fragments);
         const mainStart = this.hls.startPosition;
         const liveSyncPosition = this.hls.liveSyncPosition;
-        const startPosition = frag ? (mainStart !== -1 ? mainStart : liveSyncPosition) || frag.start : pos;
+        const startPosition = frag ? (mainStart !== -1 && mainStart >= start ? mainStart : liveSyncPosition) || frag.start : pos;
         this.log(`Setting startPosition to ${startPosition} to match initial live edge. mainStart: ${mainStart} liveSyncPosition: ${liveSyncPosition} frag.start: ${(_frag = frag) == null ? void 0 : _frag.start}`);
         this.startPosition = this.nextLoadPosition = startPosition;
       }
@@ -9844,7 +9847,7 @@ var eventemitter3 = {exports: {}};
 var eventemitter3Exports = eventemitter3.exports;
 var EventEmitter = /*@__PURE__*/getDefaultExportFromCjs(eventemitter3Exports);
 
-const version = "1.6.0-beta.2.0.canary.10846";
+const version = "1.6.0-beta.2.0.canary.10851";
 
 // ensure the worker ends up in the bundle
 // If the worker should not be included this gets aliased to empty.js
@@ -15289,7 +15292,7 @@ class PassThroughRemuxer {
     const duration = getDuration(data, initData);
     const startDTS = getStartDTS(initData, data);
     const decodeTime = startDTS === null ? timeOffset : startDTS;
-    if (isInvalidInitPts(initPTS, decodeTime, timeOffset, duration) || initSegment.timescale !== initPTS.timescale && accurateTimeOffset) {
+    if ((accurateTimeOffset || !initPTS) && (isInvalidInitPts(initPTS, decodeTime, timeOffset, duration) || initSegment.timescale !== initPTS.timescale)) {
       initSegment.initPTS = decodeTime - timeOffset;
       if (initPTS && initPTS.timescale === 1) {
         this.logger.warn(`Adjusting initPTS @${timeOffset} from ${initPTS.baseTime / initPTS.timescale} to ${initSegment.initPTS}`);
@@ -16489,41 +16492,44 @@ class AudioStreamController extends BaseStreamController {
     const cachedTrackLoadedData = this.cachedTrackLoadedData;
     if (cachedTrackLoadedData) {
       this.cachedTrackLoadedData = null;
-      this.hls.trigger(Events.AUDIO_TRACK_LOADED, cachedTrackLoadedData);
+      this.onAudioTrackLoaded(Events.AUDIO_TRACK_LOADED, cachedTrackLoadedData);
     }
   }
   onAudioTrackLoaded(event, data) {
-    var _track$details;
+    var _trackLevel$details;
     const {
       levels
     } = this;
     const {
       details: newDetails,
-      id: trackId
+      id: trackId,
+      groupId,
+      track
     } = data;
+    if (!levels) {
+      this.warn(`Audio tracks reset while loading track ${trackId} "${track.name}" of "${groupId}"`);
+      return;
+    }
     const mainDetails = this.mainDetails;
-    if (!mainDetails || mainDetails.expired || newDetails.endCC > mainDetails.endCC) {
+    if (!mainDetails || newDetails.endCC > mainDetails.endCC || mainDetails.expired) {
       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;
-    }
-    this.log(`Audio track ${trackId} loaded [${newDetails.startSN},${newDetails.endSN}]${newDetails.lastPartSn ? `[part-${newDetails.lastPartSn}-${newDetails.lastPartIndex}]` : ''},duration:${newDetails.totalduration}`);
-    const track = levels[trackId];
+    this.cachedTrackLoadedData = null;
+    this.log(`Audio track ${trackId} "${track.name}" of "${groupId}" loaded [${newDetails.startSN},${newDetails.endSN}]${newDetails.lastPartSn ? `[part-${newDetails.lastPartSn}-${newDetails.lastPartIndex}]` : ''},duration:${newDetails.totalduration}`);
+    const trackLevel = levels[trackId];
     let sliding = 0;
-    if (newDetails.live || (_track$details = track.details) != null && _track$details.live) {
+    if (newDetails.live || (_trackLevel$details = trackLevel.details) != null && _trackLevel$details.live) {
       this.checkLiveUpdate(newDetails);
       if (newDetails.deltaUpdateFailed) {
         return;
       }
-      if (track.details) {
+      if (trackLevel.details) {
         var _this$levelLastLoaded;
-        sliding = this.alignPlaylists(newDetails, track.details, (_this$levelLastLoaded = this.levelLastLoaded) == null ? void 0 : _this$levelLastLoaded.details);
+        sliding = this.alignPlaylists(newDetails, trackLevel.details, (_this$levelLastLoaded = this.levelLastLoaded) == null ? void 0 : _this$levelLastLoaded.details);
       }
       if (!newDetails.alignedSliding) {
         // Align audio rendition with the "main" playlist on discontinuity change
@@ -16535,8 +16541,8 @@ class AudioStreamController extends BaseStreamController {
         sliding = newDetails.fragmentStart;
       }
     }
-    track.details = newDetails;
-    this.levelLastLoaded = track;
+    trackLevel.details = newDetails;
+    this.levelLastLoaded = trackLevel;
 
     // compute start position if we are aligned with the main playlist
     if (!this.startFragRequested) {
@@ -16873,10 +16879,10 @@ class AudioStreamController extends BaseStreamController {
 
     // we force a frag loading in audio switch as fragment tracker might not have evicted previous frags in case of quick audio switch
     if (this.switchingTrack || fragState === FragmentState.NOT_LOADED || fragState === FragmentState.PARTIAL) {
-      var _track$details2;
+      var _track$details;
       if (!isMediaFragment(frag)) {
         this._loadInitSegment(frag, track);
-      } else if ((_track$details2 = track.details) != null && _track$details2.live && !this.initPTS[frag.cc]) {
+      } else if ((_track$details = track.details) != null && _track$details.live && !this.initPTS[frag.cc]) {
         this.log(`Waiting for video PTS in continuity counter ${frag.cc} of live stream before loading audio fragment ${frag.sn} of level ${this.trackId}`);
         this.state = State.WAITING_INIT_PTS;
         const mainDetails = this.mainDetails;
@@ -16898,9 +16904,14 @@ class AudioStreamController extends BaseStreamController {
     const bufferedAttributes = bufferedTrack == null ? void 0 : bufferedTrack.attrs;
     const switchAttributes = switchingTrack.attrs;
     if (media && bufferedAttributes && (bufferedAttributes.CHANNELS !== switchAttributes.CHANNELS || bufferedTrack.name !== switchingTrack.name || bufferedTrack.lang !== switchingTrack.lang)) {
-      this.log('Switching audio track : flushing all audio');
-      super.flushMainBuffer(0, Number.POSITIVE_INFINITY, 'audio');
-      this.bufferedTrack = null;
+      if (useAlternateAudio(switchingTrack.url, this.hls)) {
+        this.log('Switching audio track : flushing all audio');
+        super.flushMainBuffer(0, Number.POSITIVE_INFINITY, 'audio');
+        this.bufferedTrack = null;
+      } else {
+        // Main is being buffered. Set bufferedTrack so that it is flushed when switching back to alt-audio
+        this.bufferedTrack = switchingTrack;
+      }
     }
   }
   completeAudioSwitch(switchingTrack) {
@@ -31820,12 +31831,17 @@ class StreamController extends BaseStreamController {
       }
       // If switching from alt to main audio, flush all audio and trigger track switched
       if (fromAltAudio) {
+        this.fragmentTracker.removeAllFragments();
+        hls.once(Events.BUFFER_FLUSHED, () => {
+          var _this$hls;
+          (_this$hls = this.hls) == null ? void 0 : _this$hls.trigger(Events.AUDIO_TRACK_SWITCHED, data);
+        });
         hls.trigger(Events.BUFFER_FLUSHING, {
           startOffset: 0,
           endOffset: Number.POSITIVE_INFINITY,
           type: null
         });
-        this.fragmentTracker.removeAllFragments();
+        return;
       }
       hls.trigger(Events.AUDIO_TRACK_SWITCHED, data);
     } else {