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

package/package.json

@@ -130,5 +130,5 @@
     "url-toolkit": "2.2.5",
     "wrangler": "3.91.0"
   },
-  "version": "1.6.0-beta.1.0.canary.10808"
+  "version": "1.6.0-beta.1.0.canary.10810"
 }

package/src/controller/audio-stream-controller.ts

@@ -251,7 +251,7 @@ class AudioStreamController
           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: FragLoadedData = {
               frag,
               part,

package/src/controller/audio-track-controller.ts

@@ -8,6 +8,7 @@ import {
   findClosestLevelWithAudioGroup,
   findMatchingOption,
   matchesOption,
+  useAlternateAudio,
 } from '../utils/rendition-helper';
 import type Hls from '../hls';
 import type {
@@ -401,11 +402,10 @@ class AudioTrackController extends BasePlaylistController {
     if (!this.shouldLoadPlaylist(audioTrack)) {
       return;
     }
-    if (audioTrack.url === this.hls.levels[this.hls.loadLevel]?.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);
   }
 
   protected loadingPlaylist(

package/src/controller/eme-controller.ts

@@ -347,7 +347,7 @@ class EMEController extends Logger implements ComponentAPI {
         this.generateRequestWithPreferredKeySession(
           keySessionContext,
           scheme,
-          decryptdata.pssh,
+          decryptdata.pssh.buffer,
           'expired',
         );
     } else {
@@ -449,10 +449,11 @@ class EMEController extends Logger implements ComponentAPI {
       const keySessionContextPromise = (this.keyIdToKeySessionPromise[keyId] =
         keyContextPromise.then((keySessionContext) => {
           const scheme = 'cenc';
+          const initData = decryptdata.pssh ? decryptdata.pssh.buffer : null;
           return this.generateRequestWithPreferredKeySession(
             keySessionContext,
             scheme,
-            decryptdata.pssh,
+            initData,
             'playlist-key',
           );
         }));
@@ -545,7 +546,7 @@ class EMEController extends Logger implements ComponentAPI {
       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`,
@@ -730,9 +731,8 @@ class EMEController extends Logger implements ComponentAPI {
           );
         }
         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) {
         this.warn(error.message);
         if (this.hls?.config.debug) {

package/src/controller/interstitials-controller.ts

@@ -1273,6 +1273,10 @@ MediaSource ${JSON.stringify(attachMediaSourceData)} from ${logFromSource}`,
   }
 
   private onLevelUpdated(event: Events.LEVEL_UPDATED, data: LevelUpdatedData) {
+    if (data.level === -1) {
+      // level was removed
+      return;
+    }
     const main = this.hls.levels[data.level];
     const currentSelection = {
       ...(this.mediaSelection || this.altSelection),

package/src/controller/stream-controller.ts

@@ -11,6 +11,7 @@ import { PlaylistContextType, PlaylistLevelType } from '../types/loader';
 import { ChunkMetadata } from '../types/transmuxer';
 import { BufferHelper } from '../utils/buffer-helper';
 import { pickMostCompleteCodecName } from '../utils/codecs';
+import { useAlternateAudio } from '../utils/rendition-helper';
 import type { FragmentTracker } from './fragment-tracker';
 import type Hls from '../hls';
 import type { Fragment, MediaFragment } from '../loader/fragment';
@@ -851,9 +852,10 @@ export default class StreamController
     event: Events.AUDIO_TRACK_SWITCHING,
     data: AudioTrackSwitchingData,
   ) {
+    const hls = this.hls;
     // if any URL found on new audio track, it is an alternate audio track
     const fromAltAudio = this.altAudio === AlternateAudio.SWITCHED;
-    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
@@ -878,7 +880,6 @@ export default class StreamController
         // 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, {
@@ -898,8 +899,7 @@ export default class StreamController
     event: Events.AUDIO_TRACK_SWITCHED,
     data: AudioTrackSwitchedData,
   ) {
-    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

package/src/controller/timeline-controller.ts

@@ -577,7 +577,7 @@ export class TimelineController implements ComponentAPI {
     const hls = this.hls;
     // Parse the WebVTT file contents.
     const payloadWebVTT = frag.initSegment?.data
-      ? appendUint8Array(frag.initSegment.data, new Uint8Array(payload))
+      ? appendUint8Array(frag.initSegment.data, new Uint8Array(payload)).buffer
       : payload;
     parseWebVTT(
       payloadWebVTT,

package/src/crypt/decrypter.ts

@@ -86,7 +86,8 @@ export default class Decrypter {
   ): Promise<ArrayBuffer> {
     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);

package/src/demux/chunk-cache.ts

@@ -9,7 +9,7 @@ export default class ChunkCache {
 
   flush(): Uint8Array {
     const { chunks, dataLength } = this;
-    let result;
+    let result: Uint8Array;
     if (!chunks.length) {
       return new Uint8Array(0);
     } else if (chunks.length === 1) {

package/src/demux/transmuxer.ts

@@ -135,7 +135,8 @@ export default 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();
@@ -248,7 +249,7 @@ export default class Transmuxer {
       if (decryptedData) {
         // Push always returns a TransmuxerResult if decryptdata is null
         transmuxResults.push(
-          this.push(decryptedData, null, chunkMeta) as TransmuxerResult,
+          this.push(decryptedData.buffer, null, chunkMeta) as TransmuxerResult,
         );
       }
     }

package/src/types/buffer.ts

@@ -1,3 +1,12 @@
+declare global {
+  interface ArrayBuffer {
+    ' buffer_kind'?: 'array';
+  }
+  interface Uint8Array {
+    ' buffer_kind'?: 'uint8';
+  }
+}
+
 export type SourceBufferName = 'video' | 'audio' | 'audiovideo';
 
 /* eslint-disable no-restricted-globals */

package/src/utils/fetch-loader.ts

@@ -237,7 +237,7 @@ class FetchLoader implements Loader<LoaderContext> {
         .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));
@@ -251,12 +251,12 @@ class FetchLoader implements Loader<LoaderContext> {
             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();
         })

package/src/utils/rendition-helper.ts

@@ -1,6 +1,7 @@
 import { codecsSetSelectionPreferenceValue } from './codecs';
 import { getVideoSelectionOptions } from './hdr';
 import { logger } from './logger';
+import type Hls from '../hls';
 import type { Level, VideoRange } from '../types/level';
 import type {
   AudioSelectionOption,
@@ -500,3 +501,7 @@ function searchDownAndUpList(
   }
   return -1;
 }
+
+export function useAlternateAudio(audioTrackUrl: string, hls: Hls): boolean {
+  return !!audioTrackUrl && audioTrackUrl !== hls.levels[hls.loadLevel]?.uri;
+}