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

package/dist/hls.js

@@ -1058,7 +1058,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.0-beta.2.0.canary.10846");
+        newLogger.log("Debug logs enabled for \"" + context + "\" in hls.js version " + "1.6.0-beta.2.0.canary.10853");
       } catch (e) {
         /* log fn threw an exception. All logger methods are no-ops. */
         return createLogger();
@@ -7143,7 +7143,7 @@
     }, {
       key: "expired",
       get: function get() {
-        if (this.live && this.age) {
+        if (this.live && this.age && this.misses < 3) {
           var playlistWindowDuration = this.partEnd - this.fragmentStart;
           return this.age > Math.max(playlistWindowDuration, this.totalduration) + this.levelTargetDuration;
         }
@@ -8314,6 +8314,9 @@
     return drift;
   }
   function mergeDetails(oldDetails, newDetails) {
+    if (oldDetails === newDetails) {
+      return;
+    }
     // Track the last initSegment processed. Initialize it to the last one on the timeline.
     var currentInitSegment = null;
     var oldFragments = oldDetails.fragments;
@@ -9689,7 +9692,7 @@
           frag = this.getInitialLiveFragment(levelDetails, fragments);
           var mainStart = this.hls.startPosition;
           var liveSyncPosition = this.hls.liveSyncPosition;
-          var startPosition = frag ? (mainStart !== -1 ? mainStart : liveSyncPosition) || frag.start : pos;
+          var 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;
         }
@@ -15690,7 +15693,7 @@
       var duration = getDuration(data, initData);
       var startDTS = getStartDTS(initData, data);
       var 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);
@@ -16305,7 +16308,7 @@
     return !remuxResult.audio && !remuxResult.video && !remuxResult.text && !remuxResult.id3 && !remuxResult.initSegment;
   }
 
-  var version = "1.6.0-beta.2.0.canary.10846";
+  var version = "1.6.0-beta.2.0.canary.10853";
 
   // ensure the worker ends up in the bundle
   // If the worker should not be included this gets aliased to empty.js
@@ -17074,37 +17077,40 @@
       var cachedTrackLoadedData = this.cachedTrackLoadedData;
       if (cachedTrackLoadedData) {
         this.cachedTrackLoadedData = null;
-        this.hls.trigger(Events.AUDIO_TRACK_LOADED, cachedTrackLoadedData);
+        this.onAudioTrackLoaded(Events.AUDIO_TRACK_LOADED, cachedTrackLoadedData);
       }
     };
     _proto.onAudioTrackLoaded = function onAudioTrackLoaded(event, data) {
-      var _track$details;
+      var _trackLevel$details;
       var levels = this.levels;
       var newDetails = data.details,
-        trackId = data.id;
+        trackId = data.id,
+        groupId = data.groupId,
+        track = data.track;
+      if (!levels) {
+        this.warn("Audio tracks reset while loading track " + trackId + " \"" + track.name + "\" of \"" + groupId + "\"");
+        return;
+      }
       var 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);
-      var 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);
+      var trackLevel = levels[trackId];
       var 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
@@ -17116,8 +17122,8 @@
           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) {
@@ -17433,10 +17439,10 @@
 
       // 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;
           var mainDetails = this.mainDetails;
@@ -17456,9 +17462,14 @@
       var bufferedAttributes = bufferedTrack == null ? void 0 : bufferedTrack.attrs;
       var 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');
-        _BaseStreamController.prototype.flushMainBuffer.call(this, 0, Number.POSITIVE_INFINITY, 'audio');
-        this.bufferedTrack = null;
+        if (useAlternateAudio(switchingTrack.url, this.hls)) {
+          this.log('Switching audio track : flushing all audio');
+          _BaseStreamController.prototype.flushMainBuffer.call(this, 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;
+        }
       }
     };
     _proto.completeAudioSwitch = function completeAudioSwitch(switchingTrack) {
@@ -32696,6 +32707,7 @@
       transmuxer.push(payload, initSegmentData, audioCodec, videoCodec, frag, part, details.totalduration, accurateTimeOffset, chunkMeta, initPTS);
     };
     _proto.onAudioTrackSwitching = function onAudioTrackSwitching(event, data) {
+      var _this2 = this;
       var hls = this.hls;
       // if any URL found on new audio track, it is an alternate audio track
       var fromAltAudio = this.altAudio === 2;
@@ -32724,12 +32736,17 @@
         }
         // If switching from alt to main audio, flush all audio and trigger track switched
         if (fromAltAudio) {
+          this.fragmentTracker.removeAllFragments();
+          hls.once(Events.BUFFER_FLUSHED, function () {
+            var _this2$hls;
+            (_this2$hls = _this2.hls) == null ? void 0 : _this2$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 {
@@ -32954,18 +32971,18 @@
       return audioCodec;
     };
     _proto._loadBitrateTestFrag = function _loadBitrateTestFrag(fragment, level) {
-      var _this2 = this;
+      var _this3 = this;
       fragment.bitrateTest = true;
       this._doFragLoad(fragment, level).then(function (data) {
-        var hls = _this2.hls;
+        var hls = _this3.hls;
         var frag = data == null ? void 0 : data.frag;
-        if (!frag || _this2.fragContextChanged(frag)) {
+        if (!frag || _this3.fragContextChanged(frag)) {
           return;
         }
         level.fragmentError = 0;
-        _this2.state = State.IDLE;
-        _this2.startFragRequested = false;
-        _this2.bitrateTest = false;
+        _this3.state = State.IDLE;
+        _this3.startFragRequested = false;
+        _this3.bitrateTest = false;
         var stats = frag.stats;
         // Bitrate tests fragments are neither parsed nor buffered
         stats.parsing.start = stats.parsing.end = stats.buffering.start = stats.buffering.end = self.performance.now();
@@ -33120,7 +33137,7 @@
       }
     };
     _proto._bufferInitSegment = function _bufferInitSegment(currentLevel, tracks, frag, chunkMeta) {
-      var _this3 = this;
+      var _this4 = this;
       if (this.state !== State.PARSING) {
         return;
       }
@@ -33213,7 +33230,7 @@
           var track = tracks[trackName];
           var initSegment = track.initSegment;
           if (initSegment != null && initSegment.byteLength) {
-            _this3.hls.trigger(Events.BUFFER_APPENDING, {
+            _this4.hls.trigger(Events.BUFFER_APPENDING, {
               type: trackName,
               data: initSegment,
               frag: frag,