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

package/dist/hls.light.js

@@ -1029,7 +1029,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.10851");
       } catch (e) {
         /* log fn threw an exception. All logger methods are no-ops. */
         return createLogger();
@@ -5949,7 +5949,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;
         }
@@ -8001,6 +8001,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;
@@ -13946,7 +13949,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);
@@ -18773,7 +18776,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;
         }
@@ -19798,7 +19801,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.10851";
 
   // ensure the worker ends up in the bundle
   // If the worker should not be included this gets aliased to empty.js
@@ -20792,6 +20795,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;
@@ -20820,12 +20824,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 {
@@ -21050,18 +21059,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();
@@ -21216,7 +21225,7 @@
       }
     };
     _proto._bufferInitSegment = function _bufferInitSegment(currentLevel, tracks, frag, chunkMeta) {
-      var _this3 = this;
+      var _this4 = this;
       if (this.state !== State.PARSING) {
         return;
       }
@@ -21309,7 +21318,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,