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

package/dist/hls.light.js

@@ -1028,7 +1028,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.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();
@@ -1749,6 +1749,10 @@
       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);
+  }
 
   var AbrController = /*#__PURE__*/function (_Logger) {
     function AbrController(_hls) {
@@ -10411,7 +10415,8 @@
       var _this = this;
       if (this.useSoftware) {
         return new Promise(function (resolve, reject) {
-          _this.softwareDecrypt(new Uint8Array(data), key, iv, aesMode);
+          var dataView = ArrayBuffer.isView(data) ? data : new Uint8Array(data);
+          _this.softwareDecrypt(dataView, key, iv, aesMode);
           var decryptResult = _this.flush();
           if (decryptResult) {
             resolve(decryptResult.buffer);
@@ -14098,7 +14103,8 @@
           // For Low-Latency HLS Parts, decrypt in place, since part parsing is expected on push progress
           var loadingParts = chunkMeta.part > -1;
           if (loadingParts) {
-            decryptedData = decrypter.flush();
+            var _data = decrypter.flush();
+            decryptedData = _data ? _data.buffer : _data;
           }
           if (!decryptedData) {
             stats.executeEnd = now();
@@ -14178,7 +14184,7 @@
         var 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));
         }
       }
       var demuxer = this.demuxer,
@@ -14535,7 +14541,7 @@
         return reader.read().then(function (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));
           }
@@ -14548,12 +14554,12 @@
             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(function () {
@@ -19756,7 +19762,7 @@
     return !remuxResult.audio && !remuxResult.video && !remuxResult.text && !remuxResult.id3 && !remuxResult.initSegment;
   }
 
-  var version = "1.6.0-beta.1.0.canary.10808";
+  var 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
@@ -20750,9 +20756,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
@@ -20775,7 +20782,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, {
@@ -20791,8 +20797,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