rx-player 4.2.0-dev.2024081301 → 4.2.0-dev.2024082600

package/src/compat/eme/custom_media_keys/types.ts

@@ -60,3 +60,7 @@ export interface IMediaKeySessionEvents {
   // "keyerror"
   /* "error" */
 }
+
+export interface ICustomMediaEncryptedEvent extends MediaEncryptedEvent {
+  forceSessionRecreation?: boolean | undefined;
+}

package/src/compat/eme/custom_media_keys/webkit_media_keys.ts

@@ -30,7 +30,7 @@ import type { IWebKitMediaKeys } from "./webkit_media_keys_constructor";
 import { WebKitMediaKeysConstructor } from "./webkit_media_keys_constructor";
 
 export interface ICustomWebKitMediaKeys {
-  _setVideo: (videoElement: IMediaElement) => void;
+  _setVideo: (videoElement: IMediaElement) => Promise<unknown>;
   createSession(mimeType: string, initData: Uint8Array): ICustomMediaKeySession;
   setServerCertificate(setServerCertificate: BufferSource): Promise<void>;
 }

package/src/compat/eme/eme-api-implementation.ts

@@ -3,6 +3,7 @@ import assert from "../../utils/assert";
 import globalScope from "../../utils/global_scope";
 import isNode from "../../utils/is_node";
 import isNullOrUndefined from "../../utils/is_null_or_undefined";
+import objectAssign from "../../utils/object_assign";
 import type { CancellationSignal } from "../../utils/task_canceller";
 import type { IMediaElement } from "../browser_compatibility_types";
 import { isIE11 } from "../browser_detection";
@@ -19,7 +20,10 @@ import getMozMediaKeysCallbacks, {
 import getOldKitWebKitMediaKeyCallbacks, {
   isOldWebkitMediaElement,
 } from "./custom_media_keys/old_webkit_media_keys";
-import type { ICustomMediaKeys } from "./custom_media_keys/types";
+import type {
+  ICustomMediaEncryptedEvent,
+  ICustomMediaKeys,
+} from "./custom_media_keys/types";
 import getWebKitMediaKeysCallbacks from "./custom_media_keys/webkit_media_keys";
 import { WebKitMediaKeysConstructor } from "./custom_media_keys/webkit_media_keys_constructor";
 
@@ -63,7 +67,7 @@ export interface IEmeApiImplementation {
    */
   onEncrypted: (
     target: IEventTargetLike,
-    listener: (evt: unknown) => void,
+    listener: (evt: ICustomMediaEncryptedEvent) => void,
     cancelSignal: CancellationSignal,
   ) => void;
 
@@ -143,8 +147,8 @@ function getEmeApiImplementation(
     let createCustomMediaKeys: (keyType: string) => ICustomMediaKeys;
 
     if (preferredApiType === "webkit" && WebKitMediaKeysConstructor !== undefined) {
-      onEncrypted = createCompatibleEventListener(["needkey"]);
       const callbacks = getWebKitMediaKeysCallbacks();
+      onEncrypted = createOnEncryptedForWebkit();
       isTypeSupported = callbacks.isTypeSupported;
       createCustomMediaKeys = callbacks.createCustomMediaKeys;
       setMediaKeys = callbacks.setMediaKeys;
@@ -160,7 +164,7 @@ function getEmeApiImplementation(
         implementation = "older-webkit";
         // This is for WebKit with prefixed EME api
       } else if (WebKitMediaKeysConstructor !== undefined) {
-        onEncrypted = createCompatibleEventListener(["needkey"]);
+        onEncrypted = createOnEncryptedForWebkit();
         const callbacks = getWebKitMediaKeysCallbacks();
         isTypeSupported = callbacks.isTypeSupported;
         createCustomMediaKeys = callbacks.createCustomMediaKeys;
@@ -274,6 +278,33 @@ function getEmeApiImplementation(
     implementation,
   };
 }
+/**
+ * Create an event listener for the "webkitneedkey" event
+ * @returns
+ */
+function createOnEncryptedForWebkit(): IEmeApiImplementation["onEncrypted"] {
+  const compatibleEventListener = createCompatibleEventListener(
+    ["needkey"],
+    undefined /* prefixes */,
+  );
+  const onEncrypted = (
+    target: IEventTargetLike,
+    listener: (event: ICustomMediaEncryptedEvent) => void,
+    cancelSignal: CancellationSignal,
+  ) => {
+    compatibleEventListener(
+      target,
+      (event?: Event) => {
+        const patchedEvent = objectAssign(event as MediaEncryptedEvent, {
+          forceSessionRecreation: true,
+        });
+        listener(patchedEvent);
+      },
+      cancelSignal,
+    );
+  };
+  return onEncrypted;
+}
 
 /**
  * Set the given MediaKeys on the given HTMLMediaElement.

package/src/compat/eme/get_init_data.ts

@@ -20,6 +20,7 @@ import areArraysOfNumbersEqual from "../../utils/are_arrays_of_numbers_equal";
 import { be4toi } from "../../utils/byte_parsing";
 import isNullOrUndefined from "../../utils/is_null_or_undefined";
 import { PSSH_TO_INTEGER } from "./constants";
+import type { ICustomMediaEncryptedEvent } from "./custom_media_keys/types";
 
 /** Data recuperated from parsing the payload of an `encrypted` event. */
 export interface IEncryptedEventData {
@@ -50,6 +51,7 @@ export interface IEncryptedEventData {
      */
     data: Uint8Array;
   }>;
+  forceSessionRecreation?: boolean | undefined;
 }
 
 /**
@@ -145,9 +147,9 @@ function isPSSHAlreadyEncountered(
  * encountered in the given event.
  */
 export default function getInitData(
-  encryptedEvent: MediaEncryptedEvent,
+  encryptedEvent: ICustomMediaEncryptedEvent,
 ): IEncryptedEventData | null {
-  const { initData, initDataType } = encryptedEvent;
+  const { initData, initDataType, forceSessionRecreation } = encryptedEvent;
   if (isNullOrUndefined(initData)) {
     log.warn("Compat: No init data found on media encrypted event.");
     return null;
@@ -155,5 +157,5 @@ export default function getInitData(
 
   const initDataBytes = new Uint8Array(initData);
   const values = getInitializationDataValues(initDataBytes);
-  return { type: initDataType, values };
+  return { type: initDataType, values, forceSessionRecreation };
 }

package/src/compat/event_listeners.ts

@@ -30,6 +30,7 @@ import type {
   IEventTarget,
   IMediaElement,
 } from "./browser_compatibility_types";
+import type { ICustomMediaEncryptedEvent } from "./eme/custom_media_keys/types";
 
 const BROWSER_PREFIXES = ["", "webkit", "moz", "ms"];
 
@@ -82,8 +83,14 @@ function eventPrefixed(eventNames: string[], prefixes?: string[]): string[] {
 }
 
 export interface IEventEmitterLike {
-  addEventListener: (eventName: string, handler: () => void) => void;
-  removeEventListener: (eventName: string, handler: () => void) => void;
+  addEventListener: (
+    eventName: string,
+    handler: EventListenerOrEventListenerObject,
+  ) => void;
+  removeEventListener: (
+    eventName: string,
+    handler: EventListenerOrEventListenerObject,
+  ) => void;
 }
 
 export type IEventTargetLike = HTMLElement | IEventEmitterLike | IEventEmitter<unknown>;
@@ -99,12 +106,31 @@ export type IEventTargetLike = HTMLElement | IEventEmitterLike | IEventEmitter<u
  * @returns {Function} - Returns function allowing to easily add a callback to
  * be triggered when that event is emitted on a given event target.
  */
+
+function createCompatibleEventListener(
+  eventNames: Array<"needkey" | "encrypted">,
+  prefixes?: string[],
+): (
+  element: IEventTargetLike,
+  listener: (event: ICustomMediaEncryptedEvent) => void,
+  cancelSignal: CancellationSignal,
+) => void;
+
 function createCompatibleEventListener(
   eventNames: string[],
   prefixes?: string[],
 ): (
   element: IEventTargetLike,
-  listener: (event?: unknown) => void,
+  listener: (event?: Event) => void,
+  cancelSignal: CancellationSignal,
+) => void;
+
+function createCompatibleEventListener(
+  eventNames: string[] | Array<"needkey" | "encrypted">,
+  prefixes?: string[],
+): (
+  element: IEventTargetLike,
+  listener: (event?: Event | MediaEncryptedEvent) => void,
   cancelSignal: CancellationSignal,
 ) => void {
   let mem: string | undefined;
@@ -112,13 +138,12 @@ function createCompatibleEventListener(
 
   return (
     element: IEventTargetLike,
-    listener: (event?: unknown) => void,
+    listener: (event?: Event) => void,
     cancelSignal: CancellationSignal,
   ) => {
     if (cancelSignal.isCancelled()) {
       return;
     }
-
     // if the element is a HTMLElement we can detect
     // the supported event, and memoize it in `mem`
     if (typeof HTMLElement !== "undefined" && element instanceof HTMLElement) {

package/src/core/segment_sinks/inventory/segment_inventory.ts

@@ -1349,11 +1349,14 @@ function prettyPrintInventory(inventory: IBufferedChunk[]): string {
       if (encounteredPeriod === undefined) {
         currentLetter = generateNewLetter(chunk.infos);
         encounteredReps[periodId] = { [representationId]: currentLetter };
-      } else if (encounteredPeriod[representationId] === undefined) {
-        currentLetter = generateNewLetter(chunk.infos);
-        encounteredPeriod[representationId] = currentLetter;
       } else {
-        currentLetter = encounteredPeriod[representationId];
+        const previousLetter = encounteredPeriod[representationId];
+        if (previousLetter === undefined) {
+          currentLetter = generateNewLetter(chunk.infos);
+          encounteredPeriod[representationId] = currentLetter;
+        } else {
+          currentLetter = previousLetter;
+        }
       }
 
       if (lastChunk === null) {

package/src/core/segment_sinks/segment_buffers_store.ts

@@ -18,6 +18,7 @@ import { MediaError } from "../../errors";
 import log from "../../log";
 import type { IMediaSourceInterface } from "../../mse";
 import { SourceBufferType } from "../../mse";
+import assert from "../../utils/assert";
 import createCancellablePromise from "../../utils/create_cancellable_promise";
 import isNullOrUndefined from "../../utils/is_null_or_undefined";
 import type { CancellationSignal } from "../../utils/task_canceller";
@@ -251,7 +252,8 @@ export default class SegmentSinksStore {
     }
     this._initializedSegmentSinks[bufferType] = null;
     if (SegmentSinksStore.isNative(bufferType)) {
-      this._onNativeBufferAddedOrDisabled.forEach((cb) => cb());
+      this._onNativeBufferAddedOrDisabled.slice().forEach((cb) => cb());
+      assert(this._onNativeBufferAddedOrDisabled.length === 0);
     }
   }
 
@@ -295,7 +297,8 @@ export default class SegmentSinksStore {
         this._mediaSource,
       );
       this._initializedSegmentSinks[bufferType] = nativeSegmentSink;
-      this._onNativeBufferAddedOrDisabled.forEach((cb) => cb());
+      this._onNativeBufferAddedOrDisabled.slice().forEach((cb) => cb());
+      assert(this._onNativeBufferAddedOrDisabled.length === 0);
       return nativeSegmentSink;
     }
 

package/src/main_thread/api/public_api.ts

@@ -409,7 +409,7 @@ class Player extends EventEmitter<IPublicAPIEvent> {
     // See: https://bugzilla.mozilla.org/show_bug.cgi?id=1194624
     videoElement.preload = "auto";
 
-    this.version = /* PLAYER_VERSION */ "4.2.0-dev.2024081301";
+    this.version = /* PLAYER_VERSION */ "4.2.0-dev.2024082600";
     this.log = log;
     this.state = "STOPPED";
     this.videoElement = videoElement;
@@ -1889,10 +1889,18 @@ class Player extends EventEmitter<IPublicAPIEvent> {
   /**
    * Returns every available audio tracks for a given Period - or the current
    * one if no `periodId` is given.
-   * @param {string|undefined} [periodId]
+   * @param {string|Object|undefined} [arg]
    * @returns {Array.<Object>}
    */
-  getAvailableAudioTracks(periodId?: string | undefined): IAvailableAudioTrack[] {
+  getAvailableAudioTracks(
+    arg?:
+      | string
+      | undefined
+      | {
+          periodId: string;
+          filterPlayableRepresentations: boolean;
+        },
+  ): IAvailableAudioTrack[] {
     if (this._priv_contentInfos === null) {
       return [];
     }
@@ -1900,10 +1908,20 @@ class Player extends EventEmitter<IPublicAPIEvent> {
     if (isDirectFile) {
       return mediaElementTracksStore?.getAvailableAudioTracks() ?? [];
     }
+
+    let periodId: string | undefined;
+    let filterPlayableRepresentations: boolean;
+    if (typeof arg === "string") {
+      periodId = arg;
+    } else {
+      periodId = arg?.periodId;
+      filterPlayableRepresentations = arg?.filterPlayableRepresentations ?? true;
+    }
     return this._priv_callTracksStoreGetterSetter(
       periodId,
       [],
-      (tcm, periodRef) => tcm.getAvailableAudioTracks(periodRef) ?? [],
+      (tcm, periodRef) =>
+        tcm.getAvailableAudioTracks(periodRef, filterPlayableRepresentations) ?? [],
     );
   }
 
@@ -1930,10 +1948,18 @@ class Player extends EventEmitter<IPublicAPIEvent> {
 
   /**
    * Returns every available video tracks for the current Period.
-   * @param {string|undefined} [periodId]
+   * @param {string|Object|undefined} [arg]
    * @returns {Array.<Object>}
    */
-  getAvailableVideoTracks(periodId?: string | undefined): IAvailableVideoTrack[] {
+  getAvailableVideoTracks(
+    arg?:
+      | string
+      | undefined
+      | {
+          periodId: string;
+          filterPlayableRepresentations: boolean;
+        },
+  ): IAvailableVideoTrack[] {
     if (this._priv_contentInfos === null) {
       return [];
     }
@@ -1941,19 +1967,37 @@ class Player extends EventEmitter<IPublicAPIEvent> {
     if (isDirectFile) {
       return mediaElementTracksStore?.getAvailableVideoTracks() ?? [];
     }
+
+    let periodId: string | undefined;
+    let filterPlayableRepresentations: boolean;
+    if (typeof arg === "string") {
+      periodId = arg;
+    } else {
+      periodId = arg?.periodId;
+      filterPlayableRepresentations = arg?.filterPlayableRepresentations ?? true;
+    }
     return this._priv_callTracksStoreGetterSetter(
       periodId,
       [],
-      (tcm, periodRef) => tcm.getAvailableVideoTracks(periodRef) ?? [],
+      (tcm, periodRef) =>
+        tcm.getAvailableVideoTracks(periodRef, filterPlayableRepresentations) ?? [],
     );
   }
 
   /**
    * Returns currently chosen audio language for the current Period.
-   * @param {string|undefined} [periodId]
+   * @param {string|Object|undefined} [arg]
    * @returns {Object|null|undefined}
    */
-  getAudioTrack(periodId?: string | undefined): IAudioTrack | null | undefined {
+  getAudioTrack(
+    arg?:
+      | string
+      | undefined
+      | {
+          periodId: string;
+          filterPlayableRepresentations: boolean;
+        },
+  ): IAudioTrack | null | undefined {
     if (this._priv_contentInfos === null) {
       return undefined;
     }
@@ -1964,8 +2008,17 @@ class Player extends EventEmitter<IPublicAPIEvent> {
       }
       return mediaElementTracksStore.getChosenAudioTrack();
     }
+
+    let periodId: string | undefined;
+    let filterPlayableRepresentations: boolean;
+    if (typeof arg === "string") {
+      periodId = arg;
+    } else {
+      periodId = arg?.periodId;
+      filterPlayableRepresentations = arg?.filterPlayableRepresentations ?? true;
+    }
     return this._priv_callTracksStoreGetterSetter(periodId, undefined, (tcm, periodRef) =>
-      tcm.getChosenAudioTrack(periodRef),
+      tcm.getChosenAudioTrack(periodRef, filterPlayableRepresentations),
     );
   }
 
@@ -1992,10 +2045,18 @@ class Player extends EventEmitter<IPublicAPIEvent> {
 
   /**
    * Returns currently chosen video track for the current Period.
-   * @param {string|undefined} [periodId]
+   * @param {string|Object|undefined} [arg]
    * @returns {Object|null|undefined}
    */
-  getVideoTrack(periodId?: string | undefined): IVideoTrack | null | undefined {
+  getVideoTrack(
+    arg?:
+      | string
+      | undefined
+      | {
+          periodId: string;
+          filterPlayableRepresentations: boolean;
+        },
+  ): IVideoTrack | null | undefined {
     if (this._priv_contentInfos === null) {
       return undefined;
     }
@@ -2006,8 +2067,17 @@ class Player extends EventEmitter<IPublicAPIEvent> {
       }
       return mediaElementTracksStore.getChosenVideoTrack();
     }
+
+    let periodId: string | undefined;
+    let filterPlayableRepresentations: boolean;
+    if (typeof arg === "string") {
+      periodId = arg;
+    } else {
+      periodId = arg?.periodId;
+      filterPlayableRepresentations = arg?.filterPlayableRepresentations ?? true;
+    }
     return this._priv_callTracksStoreGetterSetter(periodId, undefined, (tcm, periodRef) =>
-      tcm.getChosenVideoTrack(periodRef),
+      tcm.getChosenVideoTrack(periodRef, filterPlayableRepresentations),
     );
   }
 
@@ -2612,10 +2682,12 @@ class Player extends EventEmitter<IPublicAPIEvent> {
           }
           switch (elt.adaptation.type) {
             case "audio":
-              isCurrent = tStore.getChosenAudioTrack(periodRef)?.id === elt.adaptation.id;
+              isCurrent =
+                tStore.getChosenAudioTrack(periodRef, false)?.id === elt.adaptation.id;
               break;
             case "video":
-              isCurrent = tStore.getChosenVideoTrack(periodRef)?.id === elt.adaptation.id;
+              isCurrent =
+                tStore.getChosenVideoTrack(periodRef, false)?.id === elt.adaptation.id;
               break;
             case "text":
               isCurrent = tStore.getChosenTextTrack(periodRef)?.id === elt.adaptation.id;
@@ -2690,11 +2762,11 @@ class Player extends EventEmitter<IPublicAPIEvent> {
     if (!isNullOrUndefined(tracksStore)) {
       const periodRef = tracksStore.getPeriodObjectFromPeriod(period);
       if (periodRef) {
-        const audioTrack = tracksStore.getChosenAudioTrack(periodRef);
+        const audioTrack = tracksStore.getChosenAudioTrack(periodRef, true);
         this._priv_triggerEventIfNotStopped("audioTrackChange", audioTrack, cancelSignal);
         const textTrack = tracksStore.getChosenTextTrack(periodRef);
         this._priv_triggerEventIfNotStopped("textTrackChange", textTrack, cancelSignal);
-        const videoTrack = tracksStore.getChosenVideoTrack(periodRef);
+        const videoTrack = tracksStore.getChosenVideoTrack(periodRef, true);
         this._priv_triggerEventIfNotStopped("videoTrackChange", videoTrack, cancelSignal);
       }
     } else {
@@ -2854,7 +2926,7 @@ class Player extends EventEmitter<IPublicAPIEvent> {
       }
       switch (type) {
         case "audio":
-          const audioTrack = tracksStore.getChosenAudioTrack(periodRef);
+          const audioTrack = tracksStore.getChosenAudioTrack(periodRef, true);
           this._priv_triggerEventIfNotStopped(
             "audioTrackChange",
             audioTrack,
@@ -2866,7 +2938,7 @@ class Player extends EventEmitter<IPublicAPIEvent> {
           this._priv_triggerEventIfNotStopped("textTrackChange", textTrack, cancelSignal);
           break;
         case "video":
-          const videoTrack = tracksStore.getChosenVideoTrack(periodRef);
+          const videoTrack = tracksStore.getChosenVideoTrack(periodRef, true);
           this._priv_triggerEventIfNotStopped(
             "videoTrackChange",
             videoTrack,
@@ -3178,7 +3250,7 @@ class Player extends EventEmitter<IPublicAPIEvent> {
     }
     switch (trackType) {
       case "video":
-        const videoTracks = tracksStore.getAvailableVideoTracks(periodRef);
+        const videoTracks = tracksStore.getAvailableVideoTracks(periodRef, true);
         this._priv_triggerEventIfNotStopped(
           "availableVideoTracksChange",
           videoTracks ?? [],
@@ -3186,7 +3258,7 @@ class Player extends EventEmitter<IPublicAPIEvent> {
         );
         break;
       case "audio":
-        const audioTracks = tracksStore.getAvailableAudioTracks(periodRef);
+        const audioTracks = tracksStore.getAvailableAudioTracks(periodRef, true);
         this._priv_triggerEventIfNotStopped(
           "availableAudioTracksChange",
           audioTracks ?? [],
@@ -3235,7 +3307,7 @@ class Player extends EventEmitter<IPublicAPIEvent> {
     }
   }
 }
-Player.version = /* PLAYER_VERSION */ "4.2.0-dev.2024081301";
+Player.version = /* PLAYER_VERSION */ "4.2.0-dev.2024082600";
 
 /** Every events sent by the RxPlayer's public API. */
 interface IPublicAPIEvent {
@@ -3244,8 +3316,8 @@ interface IPublicAPIEvent {
   audioTrackChange: IAudioTrack | null;
   textTrackChange: ITextTrack | null;
   videoTrackChange: IVideoTrack | null;
-  audioRepresentationChange: IVideoRepresentation | null;
-  videoRepresentationChange: IAudioRepresentation | null;
+  audioRepresentationChange: IAudioRepresentation | null;
+  videoRepresentationChange: IVideoRepresentation | null;
   volumeChange: {
     volume: number;
     muted: boolean;

package/src/main_thread/decrypt/content_decryptor.ts

@@ -177,7 +177,7 @@ export default class ContentDecryptor extends EventEmitter<IContentDecryptorEven
       mediaElement,
       (evt) => {
         log.debug("DRM: Encrypted event received from media element.");
-        const initData = getInitData(evt as MediaEncryptedEvent);
+        const initData = getInitData(evt);
         if (initData !== null) {
           this.onInitializationData(initData);
         }
@@ -730,6 +730,21 @@ export default class ContentDecryptor extends EventEmitter<IContentDecryptorEven
       return false;
     }
 
+    /**
+     * On Safari using Directfile, the old EME implementation triggers
+     * the "webkitneedkey" event instead of "encrypted". There's an issue in Safari
+     * where "webkitneedkey" fires too early before all tracks are added from an HLS playlist.
+     * Safari incorrectly assumes some keys are missing for these tracks,
+     * leading to repeated "webkitneedkey" events. Because RxPlayer recognizes
+     * it already has a session for these keys and ignores the events,
+     * the content remains frozen. To resolve this, the session is re-created.
+     */
+    const forceSessionRecreation = initializationData.forceSessionRecreation;
+    if (forceSessionRecreation === true) {
+      this.removeSessionForInitData(initializationData, mediaKeysData);
+      return false;
+    }
+
     // Check if the compatible session is blacklisted
     const blacklistedSessionError = compatibleSessionInfo.blacklistedSessionError;
     if (!isNullOrUndefined(blacklistedSessionError)) {
@@ -834,6 +849,48 @@ export default class ContentDecryptor extends EventEmitter<IContentDecryptorEven
     return false;
   }
 
+  /**
+   * Remove the session corresponding to the initData provided, and close it.
+   * It does nothing if no session was found for this initData.
+   * @param {Object} initData : The initialization data corresponding to the session
+   * that need to be removed
+   * @param {Object} mediaKeysData : The media keys data
+   */
+  private removeSessionForInitData(
+    initData: IProcessedProtectionData,
+    mediaKeysData: IAttachedMediaKeysData,
+  ) {
+    const { stores } = mediaKeysData;
+    /** Remove the session and close it from the loadedSessionStore */
+    const entry = stores.loadedSessionsStore.reuse(initData);
+    if (entry !== null) {
+      stores.loadedSessionsStore
+        .closeSession(entry.mediaKeySession)
+        .catch(() =>
+          log.error("DRM: Cannot close the session from the loaded session store"),
+        );
+    }
+
+    /**
+     * If set, a currently-used key session is already compatible to this
+     * initialization data.
+     */
+    const compatibleSessionInfo = arrayFind(this._currentSessions, (x) =>
+      x.record.isCompatibleWith(initData),
+    );
+    if (compatibleSessionInfo === undefined) {
+      return;
+    }
+    /** Remove the session from the currentSessions */
+    const indexOf = this._currentSessions.indexOf(compatibleSessionInfo);
+    if (indexOf !== -1) {
+      log.debug(
+        "DRM: A session from a processed init is removed due to forceSessionRecreation policy.",
+      );
+      this._currentSessions.splice(indexOf, 1);
+    }
+  }
+
   /**
    * Callback that should be called if an error that made the current
    * `ContentDecryptor` instance unusable arised.
@@ -1147,8 +1204,8 @@ function addKeyIdsFromPeriod(set: Set<Uint8Array>, period: IPeriodMetadata) {
         representation.contentProtections !== undefined &&
         representation.contentProtections.keyIds !== undefined
       ) {
-        for (const kidInf of representation.contentProtections.keyIds) {
-          set.add(kidInf.keyId);
+        for (const kid of representation.contentProtections.keyIds) {
+          set.add(kid);
         }
       }
     }

package/src/main_thread/decrypt/types.ts

@@ -127,6 +127,11 @@ export interface IProtectionData {
 /** Protection initialization data actually processed by the `ContentDecryptor`. */
 export interface IProcessedProtectionData extends Omit<IProtectionData, "values"> {
   values: InitDataValuesContainer;
+  /**
+   * Enforce to recreate the media key session if there is already a session created
+   * with this init data
+   */
+  forceSessionRecreation?: boolean | undefined;
 }
 
 /**

package/src/main_thread/init/media_source_content_initializer.ts

@@ -1267,17 +1267,17 @@ function updateKeyIdsDecipherabilityOnManifest(
     if (contentKIDs !== undefined) {
       for (const elt of contentKIDs) {
         for (const blacklistedKeyId of blacklistedKeyIds) {
-          if (areArraysOfNumbersEqual(blacklistedKeyId, elt.keyId)) {
+          if (areArraysOfNumbersEqual(blacklistedKeyId, elt)) {
             return false;
           }
         }
         for (const whitelistedKeyId of whitelistedKeyIds) {
-          if (areArraysOfNumbersEqual(whitelistedKeyId, elt.keyId)) {
+          if (areArraysOfNumbersEqual(whitelistedKeyId, elt)) {
             return true;
           }
         }
         for (const delistedKeyId of delistedKeyIds) {
-          if (areArraysOfNumbersEqual(delistedKeyId, elt.keyId)) {
+          if (areArraysOfNumbersEqual(delistedKeyId, elt)) {
             return undefined;
           }
         }