hls.js 1.6.0-beta.1.0.canary.10809 → 1.6.0-beta.1.0.canary.10811

package/dist/hls.js

@@ -1057,7 +1057,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.1.0.canary.10809");
+        newLogger.log("Debug logs enabled for \"" + context + "\" in hls.js version " + "1.6.0-beta.1.0.canary.10811");
       } catch (e) {
         /* log fn threw an exception. All logger methods are no-ops. */
         return createLogger();
@@ -2047,6 +2047,10 @@
     }
     return -1;
   }
+  function useAlternateAudio(audioTrackUrl, hls) {
+    var _hls$levels$hls$loadL;
+    return !!audioTrackUrl && audioTrackUrl !== ((_hls$levels$hls$loadL = hls.levels[hls.loadLevel]) == null ? void 0 : _hls$levels$hls$loadL.uri);
+  }
 
   var AbrController = /*#__PURE__*/function (_Logger) {
     function AbrController(_hls) {
@@ -14743,19 +14747,23 @@
       this.videoTrackConfig = undefined;
     };
     _proto.getVideoStartPts = function getVideoStartPts(videoSamples) {
+      // Get the minimum PTS value relative to the first sample's PTS, normalized for 33-bit wrapping
       var rolloverDetected = false;
+      var firstPts = videoSamples[0].pts;
       var startPTS = videoSamples.reduce(function (minPTS, sample) {
-        var delta = sample.pts - minPTS;
+        var pts = sample.pts;
+        var delta = pts - minPTS;
         if (delta < -4294967296) {
           // 2^32, see PTSNormalize for reasoning, but we're hitting a rollover here, and we don't want that to impact the timeOffset calculation
           rolloverDetected = true;
-          return normalizePts(minPTS, sample.pts);
-        } else if (delta > 0) {
+          pts = normalizePts(pts, firstPts);
+          delta = pts - minPTS;
+        }
+        if (delta > 0) {
           return minPTS;
-        } else {
-          return sample.pts;
         }
-      }, videoSamples[0].pts);
+        return pts;
+      }, firstPts);
       if (rolloverDetected) {
         this.logger.debug('PTS rollover detected');
       }
@@ -16288,7 +16296,7 @@
     return !remuxResult.audio && !remuxResult.video && !remuxResult.text && !remuxResult.id3 && !remuxResult.initSegment;
   }
 
-  var version = "1.6.0-beta.1.0.canary.10809";
+  var version = "1.6.0-beta.1.0.canary.10811";
 
   // ensure the worker ends up in the bundle
   // If the worker should not be included this gets aliased to empty.js
@@ -17992,17 +18000,15 @@
       return -1;
     };
     _proto.loadPlaylist = function loadPlaylist(hlsUrlParameters) {
-      var _this$hls$levels$this;
       _BasePlaylistControll.prototype.loadPlaylist.call(this);
       var audioTrack = this.currentTrack;
       if (!this.shouldLoadPlaylist(audioTrack)) {
         return;
       }
-      if (audioTrack.url === ((_this$hls$levels$this = this.hls.levels[this.hls.loadLevel]) == null ? void 0 : _this$hls$levels$this.uri)) {
-        // Do not load audio rendition with URI matching main variant URI
-        return;
+      // Do not load audio rendition with URI matching main variant URI
+      if (useAlternateAudio(audioTrack.url, this.hls)) {
+        this.scheduleLoading(audioTrack, hlsUrlParameters);
       }
-      this.scheduleLoading(audioTrack, hlsUrlParameters);
     };
     _proto.loadingPlaylist = function loadingPlaylist(audioTrack, hlsUrlParameters) {
       _BasePlaylistControll.prototype.loadingPlaylist.call(this, audioTrack, hlsUrlParameters);
@@ -24517,6 +24523,10 @@
       this.hls.on(Events.BUFFER_CODECS, this.onBufferCodecs, this);
     };
     _proto.onLevelUpdated = function onLevelUpdated(event, data) {
+      if (data.level === -1) {
+        // level was removed
+        return;
+      }
       var main = this.hls.levels[data.level];
       var currentSelection = _objectSpread2(_objectSpread2({}, this.mediaSelection || this.altSelection), {}, {
         main: main
@@ -32613,9 +32623,10 @@
       transmuxer.push(payload, initSegmentData, audioCodec, videoCodec, frag, part, details.totalduration, accurateTimeOffset, chunkMeta, initPTS);
     };
     _proto.onAudioTrackSwitching = function onAudioTrackSwitching(event, data) {
+      var hls = this.hls;
       // if any URL found on new audio track, it is an alternate audio track
       var fromAltAudio = this.altAudio === 2;
-      var altAudio = !!data.url;
+      var altAudio = useAlternateAudio(data.url, hls);
       // if we switch on main audio, ensure that main fragment scheduling is synced with media.buffered
       // don't do anything if we switch to alt audio: audio stream controller is handling it.
       // we will just have to change buffer scheduling on audioTrackSwitched
@@ -32638,7 +32649,6 @@
           // Reset audio transmuxer so when switching back to main audio we're not still appending where we left off
           this.resetTransmuxer();
         }
-        var hls = this.hls;
         // If switching from alt to main audio, flush all audio and trigger track switched
         if (fromAltAudio) {
           hls.trigger(Events.BUFFER_FLUSHING, {
@@ -32654,8 +32664,7 @@
       }
     };
     _proto.onAudioTrackSwitched = function onAudioTrackSwitched(event, data) {
-      var trackId = data.id;
-      var altAudio = !!this.hls.audioTracks[trackId].url;
+      var altAudio = useAlternateAudio(data.url, this.hls);
       if (altAudio) {
         var videoBuffer = this.videoBuffer;
         // if we switched on alternate audio, ensure that main fragment scheduling is synced with video sourcebuffer buffered