hls.js 1.6.0-beta.1.0.canary.10808 → 1.6.0-beta.1.0.canary.10810

package/dist/hls.light.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.10808"}`);
+      newLogger.log(`Debug logs enabled for "${context}" in hls.js version ${"1.6.0-beta.1.0.canary.10810"}`);
     } catch (e) {
       /* log fn threw an exception. All logger methods are no-ops. */
       return createLogger();
@@ -1059,6 +1059,10 @@ function getCodecTiers(levels, audioTracksByGroup, minAutoLevel, maxAutoLevel) {
     return tiers;
   }, {});
 }
+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) {
@@ -6653,7 +6657,8 @@ class Decrypter {
   decrypt(data, key, iv, aesMode) {
     if (this.useSoftware) {
       return new Promise((resolve, reject) => {
-        this.softwareDecrypt(new Uint8Array(data), key, iv, aesMode);
+        const dataView = ArrayBuffer.isView(data) ? data : new Uint8Array(data);
+        this.softwareDecrypt(dataView, key, iv, aesMode);
         const decryptResult = this.flush();
         if (decryptResult) {
           resolve(decryptResult.buffer);
@@ -16390,7 +16395,8 @@ class Transmuxer {
         // For Low-Latency HLS Parts, decrypt in place, since part parsing is expected on push progress
         const loadingParts = chunkMeta.part > -1;
         if (loadingParts) {
-          decryptedData = decrypter.flush();
+          const _data = decrypter.flush();
+          decryptedData = _data ? _data.buffer : _data;
         }
         if (!decryptedData) {
           stats.executeEnd = now();
@@ -16472,7 +16478,7 @@ class Transmuxer {
       const decryptedData = decrypter.flush();
       if (decryptedData) {
         // Push always returns a TransmuxerResult if decryptdata is null
-        transmuxResults.push(this.push(decryptedData, null, chunkMeta));
+        transmuxResults.push(this.push(decryptedData.buffer, null, chunkMeta));
       }
     }
     const {
@@ -16841,7 +16847,7 @@ class FetchLoader {
       return reader.read().then(data => {
         if (data.done) {
           if (chunkCache.dataLength) {
-            onProgress(stats, context, chunkCache.flush(), response);
+            onProgress(stats, context, chunkCache.flush().buffer, response);
           }
           return Promise.resolve(new ArrayBuffer(0));
         }
@@ -16854,12 +16860,12 @@ class FetchLoader {
           chunkCache.push(chunk);
           if (chunkCache.dataLength >= highWaterMark) {
             // flush in order to join the typed arrays
-            onProgress(stats, context, chunkCache.flush(), response);
+            onProgress(stats, context, chunkCache.flush().buffer, response);
           }
         } else {
           // If there's nothing cached already, and the chache is large enough
           // just emit the progress event
-          onProgress(stats, context, chunk, response);
+          onProgress(stats, context, chunk.buffer, response);
         }
         return pump();
       }).catch(() => {
@@ -19136,7 +19142,7 @@ class GapController extends Logger {
   }
 }
 
-const version = "1.6.0-beta.1.0.canary.10808";
+const version = "1.6.0-beta.1.0.canary.10810";
 
 // ensure the worker ends up in the bundle
 // If the worker should not be included this gets aliased to empty.js
@@ -20160,9 +20166,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
@@ -20185,7 +20192,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, {
@@ -20201,8 +20207,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