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

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.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();
@@ -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) {
@@ -5862,7 +5866,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);
@@ -15844,7 +15849,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();
@@ -15924,7 +15930,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,
@@ -16286,7 +16292,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
@@ -16852,7 +16858,7 @@
               if (this.initPTS[frag.cc] !== undefined) {
                 this.waitingData = null;
                 this.state = State.FRAG_LOADING;
-                var payload = cache.flush();
+                var payload = cache.flush().buffer;
                 var data = {
                   frag: frag,
                   part: part,
@@ -17990,17 +17996,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);
@@ -21736,7 +21740,7 @@
           var json = bin2str(new Uint8Array(initData));
           try {
             var sinf = base64Decode(JSON.parse(json).sinf);
-            var tenc = parseSinf(new Uint8Array(sinf));
+            var tenc = parseSinf(sinf);
             if (!tenc) {
               throw new Error("'schm' box missing or not cbcs/cenc with schi > tenc");
             }
@@ -22022,7 +22026,7 @@
         var keySessionContext = this.createMediaKeySessionContext(mediaKeySessionContext);
         var keyId = this.getKeyIdString(decryptdata);
         var scheme = 'cenc';
-        this.keyIdToKeySessionPromise[keyId] = this.generateRequestWithPreferredKeySession(keySessionContext, scheme, decryptdata.pssh, 'expired');
+        this.keyIdToKeySessionPromise[keyId] = this.generateRequestWithPreferredKeySession(keySessionContext, scheme, decryptdata.pssh.buffer, 'expired');
       } else {
         this.warn("Could not renew expired session. Missing pssh initData.");
       }
@@ -22093,7 +22097,8 @@
         });
         var keySessionContextPromise = this.keyIdToKeySessionPromise[keyId] = keyContextPromise.then(function (keySessionContext) {
           var scheme = 'cenc';
-          return _this6.generateRequestWithPreferredKeySession(keySessionContext, scheme, decryptdata.pssh, 'playlist-key');
+          var initData = decryptdata.pssh ? decryptdata.pssh.buffer : null;
+          return _this6.generateRequestWithPreferredKeySession(keySessionContext, scheme, initData, 'playlist-key');
         });
         keySessionContextPromise.catch(function (error) {
           return _this6.handleError(error);
@@ -22180,7 +22185,8 @@
             throw new Error('Invalid response from configured generateRequest filter');
           }
           initDataType = mappedInitData.initDataType;
-          initData = context.decryptdata.pssh = mappedInitData.initData ? new Uint8Array(mappedInitData.initData) : null;
+          initData = mappedInitData.initData ? mappedInitData.initData : null;
+          context.decryptdata.pssh = initData ? new Uint8Array(initData) : null;
         } catch (error) {
           var _this$hls;
           this.warn(error.message);
@@ -24513,6 +24519,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
@@ -29352,7 +29362,7 @@
       }
       var hls = this.hls;
       // Parse the WebVTT file contents.
-      var payloadWebVTT = (_frag$initSegment = frag.initSegment) != null && _frag$initSegment.data ? appendUint8Array(frag.initSegment.data, new Uint8Array(payload)) : payload;
+      var payloadWebVTT = (_frag$initSegment = frag.initSegment) != null && _frag$initSegment.data ? appendUint8Array(frag.initSegment.data, new Uint8Array(payload)).buffer : payload;
       parseWebVTT(payloadWebVTT, this.initPTS[frag.cc], this.vttCCs, frag.cc, frag.start, function (cues) {
         _this5._appendCues(cues, frag.level);
         hls.trigger(Events.SUBTITLE_FRAG_PROCESSED, {
@@ -29761,7 +29771,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));
           }
@@ -29774,12 +29784,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 () {
@@ -32609,9 +32619,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
@@ -32634,7 +32645,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, {
@@ -32650,8 +32660,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