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

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.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();
@@ -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) {
@@ -5235,7 +5239,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);
@@ -9830,7 +9835,7 @@ var eventemitter3 = {exports: {}};
 var eventemitter3Exports = eventemitter3.exports;
 var EventEmitter = /*@__PURE__*/getDefaultExportFromCjs(eventemitter3Exports);
 
-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
@@ -15445,7 +15450,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();
@@ -15527,7 +15533,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 {
@@ -16260,7 +16266,7 @@ class AudioStreamController extends BaseStreamController {
             if (this.initPTS[frag.cc] !== undefined) {
               this.waitingData = null;
               this.state = State.FRAG_LOADING;
-              const payload = cache.flush();
+              const payload = cache.flush().buffer;
               const data = {
                 frag,
                 part,
@@ -17436,17 +17442,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);
@@ -21067,7 +21071,7 @@ class EMEController extends Logger {
         const json = bin2str(new Uint8Array(initData));
         try {
           const sinf = base64Decode(JSON.parse(json).sinf);
-          const tenc = parseSinf(new Uint8Array(sinf));
+          const tenc = parseSinf(sinf);
           if (!tenc) {
             throw new Error(`'schm' box missing or not cbcs/cenc with schi > tenc`);
           }
@@ -21332,7 +21336,7 @@ class EMEController extends Logger {
       const keySessionContext = this.createMediaKeySessionContext(mediaKeySessionContext);
       const keyId = this.getKeyIdString(decryptdata);
       const 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.`);
     }
@@ -21402,7 +21406,8 @@ class EMEController extends Logger {
       });
       const keySessionContextPromise = this.keyIdToKeySessionPromise[keyId] = keyContextPromise.then(keySessionContext => {
         const scheme = 'cenc';
-        return this.generateRequestWithPreferredKeySession(keySessionContext, scheme, decryptdata.pssh, 'playlist-key');
+        const initData = decryptdata.pssh ? decryptdata.pssh.buffer : null;
+        return this.generateRequestWithPreferredKeySession(keySessionContext, scheme, initData, 'playlist-key');
       });
       keySessionContextPromise.catch(error => this.handleError(error));
     }
@@ -21482,7 +21487,8 @@ class EMEController extends Logger {
           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);
@@ -24577,6 +24583,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
@@ -28445,7 +28455,7 @@ class TimelineController {
     }
     const hls = this.hls;
     // Parse the WebVTT file contents.
-    const payloadWebVTT = (_frag$initSegment = frag.initSegment) != null && _frag$initSegment.data ? appendUint8Array(frag.initSegment.data, new Uint8Array(payload)) : payload;
+    const 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, cues => {
       this._appendCues(cues, frag.level);
       hls.trigger(Events.SUBTITLE_FRAG_PROCESSED, {
@@ -28853,7 +28863,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));
         }
@@ -28866,12 +28876,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(() => {
@@ -31711,9 +31721,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
@@ -31736,7 +31747,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, {
@@ -31752,8 +31762,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