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

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.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();
@@ -1305,6 +1305,10 @@ function searchDownAndUpList(arr, searchIndex, predicate) {
   }
   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);
+}
 
 class AbrController extends Logger {
   constructor(_hls) {
@@ -9831,7 +9835,7 @@ var eventemitter3 = {exports: {}};
 var eventemitter3Exports = eventemitter3.exports;
 var EventEmitter = /*@__PURE__*/getDefaultExportFromCjs(eventemitter3Exports);
 
-const version = "1.6.0-beta.1.0.canary.10809";
+const 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
@@ -14342,19 +14346,23 @@ class MP4Remuxer {
     this.videoTrackConfig = undefined;
   }
   getVideoStartPts(videoSamples) {
+    // Get the minimum PTS value relative to the first sample's PTS, normalized for 33-bit wrapping
     let rolloverDetected = false;
+    const firstPts = videoSamples[0].pts;
     const startPTS = videoSamples.reduce((minPTS, sample) => {
-      const delta = sample.pts - minPTS;
+      let pts = sample.pts;
+      let 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');
     }
@@ -17438,17 +17446,15 @@ class AudioTrackController extends BasePlaylistController {
     return -1;
   }
   loadPlaylist(hlsUrlParameters) {
-    var _this$hls$levels$this;
     super.loadPlaylist();
     const 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);
   }
   loadingPlaylist(audioTrack, hlsUrlParameters) {
     super.loadingPlaylist(audioTrack, hlsUrlParameters);
@@ -24581,6 +24587,10 @@ MediaSource ${JSON.stringify(attachMediaSourceData)} from ${logFromSource}`);
     this.hls.on(Events.BUFFER_CODECS, this.onBufferCodecs, this);
   }
   onLevelUpdated(event, data) {
+    if (data.level === -1) {
+      // level was removed
+      return;
+    }
     const main = this.hls.levels[data.level];
     const currentSelection = _objectSpread2(_objectSpread2({}, this.mediaSelection || this.altSelection), {}, {
       main
@@ -31715,9 +31725,10 @@ class StreamController extends BaseStreamController {
     transmuxer.push(payload, initSegmentData, audioCodec, videoCodec, frag, part, details.totalduration, accurateTimeOffset, chunkMeta, initPTS);
   }
   onAudioTrackSwitching(event, data) {
+    const hls = this.hls;
     // if any URL found on new audio track, it is an alternate audio track
     const fromAltAudio = this.altAudio === 2;
-    const altAudio = !!data.url;
+    const 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
@@ -31740,7 +31751,6 @@ class StreamController extends BaseStreamController {
         // Reset audio transmuxer so when switching back to main audio we're not still appending where we left off
         this.resetTransmuxer();
       }
-      const hls = this.hls;
       // If switching from alt to main audio, flush all audio and trigger track switched
       if (fromAltAudio) {
         hls.trigger(Events.BUFFER_FLUSHING, {
@@ -31756,8 +31766,7 @@ class StreamController extends BaseStreamController {
     }
   }
   onAudioTrackSwitched(event, data) {
-    const trackId = data.id;
-    const altAudio = !!this.hls.audioTracks[trackId].url;
+    const altAudio = useAlternateAudio(data.url, this.hls);
     if (altAudio) {
       const videoBuffer = this.videoBuffer;
       // if we switched on alternate audio, ensure that main fragment scheduling is synced with video sourcebuffer buffered