rx-player 4.2.0-dev.2024080600 → 4.2.0-dev.2024081300

package/dist/es2017/main_thread/decrypt/find_key_system.js

@@ -31,7 +31,7 @@ import MediaKeysInfosStore from "./utils/media_keys_infos_store";
  * @param {Object} currentKeySystemOptions
  * @returns {null|Object}
  */
-function checkCachedMediaKeySystemAccess(keySystems, currentKeySystemAccess, currentKeySystemOptions) {
+function checkCachedMediaKeySystemAccess(keySystems, askedConfiguration, currentKeySystemAccess, currentKeySystemOptions) {
     const mksConfiguration = currentKeySystemAccess.getConfiguration();
     if (shouldRenewMediaKeySystemAccess() || isNullOrUndefined(mksConfiguration)) {
         return null;
@@ -56,6 +56,7 @@ function checkCachedMediaKeySystemAccess(keySystems, currentKeySystemAccess, cur
         return {
             keySystemOptions: firstCompatibleOption,
             keySystemAccess: currentKeySystemAccess,
+            askedConfiguration,
         };
     }
     return null;
@@ -173,6 +174,27 @@ function buildKeySystemConfigurations(keySystemTypeInfo) {
         persistentState,
         sessionTypes,
     };
+    if (audioCapabilitiesConfig !== undefined) {
+        if (videoCapabilitiesConfig !== undefined) {
+            return [wantedMediaKeySystemConfiguration];
+        }
+        return [
+            wantedMediaKeySystemConfiguration,
+            Object.assign(Object.assign({}, wantedMediaKeySystemConfiguration), { 
+                // Re-try without `videoCapabilities` in case the EME implementation is
+                // buggy
+                videoCapabilities: undefined }),
+        ];
+    }
+    else if (videoCapabilitiesConfig !== undefined) {
+        return [
+            wantedMediaKeySystemConfiguration,
+            Object.assign(Object.assign({}, wantedMediaKeySystemConfiguration), { 
+                // Re-try without `audioCapabilities` in case the EME implementation is
+                // buggy
+                audioCapabilities: undefined }),
+        ];
+    }
     return [
         wantedMediaKeySystemConfiguration,
         // Some legacy implementations have issues with `audioCapabilities` and
@@ -183,23 +205,21 @@ function buildKeySystemConfigurations(keySystemTypeInfo) {
 }
 /**
  * Extract from the current mediaKeys the supported Codecs.
- * @param {Object | undefined} audioCapabilitiesConfig - The audio capabilities provided to the KeySystem.
- * @param {Object | undefined} videoCapabilitiesConfig - The video capabilities provided to the KeySystem.
- * @param {Object | undefined} mksConfiguration - The result of getConfiguration() of the media keys.
+ * @param {Object} initialConfiguration - The MediaKeySystemConfiguration given
+ * to the `navigator.requestMediaKeySystemAccess` API.
+ * @param {Object | undefined} mksConfiguration - The result of
+ * getConfiguration() of the media keys.
  * @return {Array} The list of supported codec by the CDM.
  */
-export function extractCodecSupportListFromConfiguration(audioCapabilitiesConfig, videoCapabilitiesConfig, mksConfiguration) {
-    var _a, _b;
-    const { EME_DEFAULT_AUDIO_CODECS, EME_DEFAULT_VIDEO_CODECS } = config.getCurrent();
-    const testedAudioCodecs = (audioCapabilitiesConfig === null || audioCapabilitiesConfig === void 0 ? void 0 : audioCapabilitiesConfig.type) === "contentType"
-        ? audioCapabilitiesConfig === null || audioCapabilitiesConfig === void 0 ? void 0 : audioCapabilitiesConfig.value
-        : EME_DEFAULT_AUDIO_CODECS;
-    const testedVideoCodecs = (videoCapabilitiesConfig === null || videoCapabilitiesConfig === void 0 ? void 0 : videoCapabilitiesConfig.type) === "contentType"
-        ? videoCapabilitiesConfig.value
-        : EME_DEFAULT_VIDEO_CODECS;
-    const testedCodecs = testedAudioCodecs.concat(testedVideoCodecs);
-    const supportedVideoCodecs = (_a = mksConfiguration.videoCapabilities) === null || _a === void 0 ? void 0 : _a.map((entry) => entry.contentType);
-    const supportedAudioCodecs = (_b = mksConfiguration.audioCapabilities) === null || _b === void 0 ? void 0 : _b.map((entry) => entry.contentType);
+export function extractCodecSupportListFromConfiguration(initialConfiguration, mksConfiguration) {
+    var _a, _b, _c, _d, _e, _f;
+    const testedAudioCodecs = (_b = (_a = initialConfiguration.audioCapabilities) === null || _a === void 0 ? void 0 : _a.map((v) => v.contentType)) !== null && _b !== void 0 ? _b : [];
+    const testedVideoCodecs = (_d = (_c = initialConfiguration.videoCapabilities) === null || _c === void 0 ? void 0 : _c.map((v) => v.contentType)) !== null && _d !== void 0 ? _d : [];
+    const testedCodecs = testedAudioCodecs
+        .concat(testedVideoCodecs)
+        .filter((c) => c !== undefined);
+    const supportedVideoCodecs = (_e = mksConfiguration.videoCapabilities) === null || _e === void 0 ? void 0 : _e.map((entry) => entry.contentType);
+    const supportedAudioCodecs = (_f = mksConfiguration.audioCapabilities) === null || _f === void 0 ? void 0 : _f.map((entry) => entry.contentType);
     const supportedCodecs = [
         ...(supportedVideoCodecs !== null && supportedVideoCodecs !== void 0 ? supportedVideoCodecs : []),
         ...(supportedAudioCodecs !== null && supportedAudioCodecs !== void 0 ? supportedAudioCodecs : []),
@@ -249,15 +269,16 @@ export default function getMediaKeySystemAccess(mediaElement, keySystemsConfigs,
         if (eme.implementation === currentState.emeImplementation.implementation) {
             // Fast way to find a compatible keySystem if the currently loaded
             // one as exactly the same compatibility options.
-            const cachedKeySystemAccess = checkCachedMediaKeySystemAccess(keySystemsConfigs, currentState.mediaKeySystemAccess, currentState.keySystemOptions);
+            const cachedKeySystemAccess = checkCachedMediaKeySystemAccess(keySystemsConfigs, currentState.askedConfiguration, currentState.mediaKeySystemAccess, currentState.keySystemOptions);
             if (cachedKeySystemAccess !== null) {
                 log.info("DRM: Found cached compatible keySystem");
                 return Promise.resolve({
                     type: "reuse-media-key-system-access",
                     value: {
                         mediaKeySystemAccess: cachedKeySystemAccess.keySystemAccess,
+                        askedConfiguration: cachedKeySystemAccess.askedConfiguration,
                         options: cachedKeySystemAccess.keySystemOptions,
-                        codecSupport: extractCodecSupportListFromConfiguration(cachedKeySystemAccess.keySystemOptions.audioCapabilitiesConfig, cachedKeySystemAccess.keySystemOptions.videoCapabilitiesConfig, cachedKeySystemAccess.keySystemAccess.getConfiguration()),
+                        codecSupport: extractCodecSupportListFromConfiguration(cachedKeySystemAccess.askedConfiguration, cachedKeySystemAccess.keySystemAccess.getConfiguration()),
                     },
                 });
             }
@@ -314,25 +335,30 @@ export default function getMediaKeySystemAccess(mediaElement, keySystemsConfigs,
         const keySystemConfigurations = buildKeySystemConfigurations(chosenType);
         log.debug(`DRM: Request keysystem access ${keyType},` +
             `${index + 1} of ${keySystemsType.length}`);
-        try {
-            const keySystemAccess = await testKeySystem(keyType, keySystemConfigurations);
-            log.info("DRM: Found compatible keysystem", keyType, index + 1);
-            return {
-                type: "create-media-key-system-access",
-                value: {
-                    options: keySystemOptions,
-                    mediaKeySystemAccess: keySystemAccess,
-                    codecSupport: extractCodecSupportListFromConfiguration(keySystemOptions.audioCapabilitiesConfig, keySystemOptions.videoCapabilitiesConfig, keySystemAccess.getConfiguration()),
-                },
-            };
-        }
-        catch (_) {
-            log.debug("DRM: Rejected access to keysystem", keyType, index + 1);
-            if (cancelSignal.cancellationError !== null) {
-                throw cancelSignal.cancellationError;
+        let keySystemAccess;
+        for (let configIdx = 0; configIdx < keySystemConfigurations.length; configIdx++) {
+            const keySystemConfiguration = keySystemConfigurations[configIdx];
+            try {
+                keySystemAccess = await testKeySystem(keyType, [keySystemConfiguration]);
+                log.info("DRM: Found compatible keysystem", keyType, index + 1);
+                return {
+                    type: "create-media-key-system-access",
+                    value: {
+                        options: keySystemOptions,
+                        mediaKeySystemAccess: keySystemAccess,
+                        askedConfiguration: keySystemConfiguration,
+                        codecSupport: extractCodecSupportListFromConfiguration(keySystemConfiguration, keySystemAccess.getConfiguration()),
+                    },
+                };
+            }
+            catch (_) {
+                log.debug("DRM: Rejected access to keysystem", keyType, index + 1, configIdx);
+                if (cancelSignal.cancellationError !== null) {
+                    throw cancelSignal.cancellationError;
+                }
             }
-            return recursivelyTestKeySystems(index + 1);
         }
+        return recursivelyTestKeySystems(index + 1);
     }
 }
 /**

package/dist/es2017/main_thread/decrypt/get_media_keys.d.ts

@@ -23,6 +23,11 @@ import type { IMediaKeySessionStores } from "./types";
 export interface IMediaKeysInfos {
     /** The MediaKeySystemAccess which allowed to create the MediaKeys instance. */
     mediaKeySystemAccess: MediaKeySystemAccess | ICustomMediaKeySystemAccess;
+    /**
+     * The MediaKeySystemConfiguration that has been provided to the
+     * `requestMediaKeySystemAccess` API.
+     */
+    askedConfiguration: MediaKeySystemConfiguration;
     /** The MediaKeys instance. */
     mediaKeys: MediaKeys | ICustomMediaKeys;
     /** Stores allowing to create and retrieve MediaKeySessions. */

package/dist/es2017/main_thread/decrypt/get_media_keys.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get_media_keys.d.ts","sourceRoot":"","sources":["../../../../src/main_thread/decrypt/get_media_keys.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,0CAA0C,CAAC;AAE9E,OAAO,KAAK,EAAE,gBAAgB,EAAE,2BAA2B,EAAE,MAAM,kBAAkB,CAAC;AAGtF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAE3D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAErE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,SAAS,CAAC;AAuBtD,8CAA8C;AAC9C,MAAM,WAAW,eAAe;IAC9B,+EAA+E;IAC/E,oBAAoB,EAAE,oBAAoB,GAAG,2BAA2B,CAAC;IACzE,8BAA8B;IAC9B,SAAS,EAAE,SAAS,GAAG,gBAAgB,CAAC;IACxC,+DAA+D;IAC/D,MAAM,EAAE,sBAAsB,CAAC;IAC/B,qEAAqE;IACrE,OAAO,EAAE,gBAAgB,CAAC;IAC1B,yBAAyB;IACzB,YAAY,EAAE,iBAAiB,CAAC;CACjC;AAED;;;;;;;;;;;;GAYG;AACH,wBAA8B,iBAAiB,CAC7C,YAAY,EAAE,aAAa,EAC3B,iBAAiB,EAAE,gBAAgB,EAAE,EACrC,YAAY,EAAE,kBAAkB,GAC/B,OAAO,CAAC,eAAe,CAAC,CAiD1B"}
+{"version":3,"file":"get_media_keys.d.ts","sourceRoot":"","sources":["../../../../src/main_thread/decrypt/get_media_keys.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,0CAA0C,CAAC;AAE9E,OAAO,KAAK,EAAE,gBAAgB,EAAE,2BAA2B,EAAE,MAAM,kBAAkB,CAAC;AAGtF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAE3D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAErE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,SAAS,CAAC;AAuBtD,8CAA8C;AAC9C,MAAM,WAAW,eAAe;IAC9B,+EAA+E;IAC/E,oBAAoB,EAAE,oBAAoB,GAAG,2BAA2B,CAAC;IACzE;;;OAGG;IACH,kBAAkB,EAAE,2BAA2B,CAAC;IAChD,8BAA8B;IAC9B,SAAS,EAAE,SAAS,GAAG,gBAAgB,CAAC;IACxC,+DAA+D;IAC/D,MAAM,EAAE,sBAAsB,CAAC;IAC/B,qEAAqE;IACrE,OAAO,EAAE,gBAAgB,CAAC;IAC1B,yBAAyB;IACzB,YAAY,EAAE,iBAAiB,CAAC;CACjC;AAED;;;;;;;;;;;;GAYG;AACH,wBAA8B,iBAAiB,CAC7C,YAAY,EAAE,aAAa,EAC3B,iBAAiB,EAAE,gBAAgB,EAAE,EACrC,YAAY,EAAE,kBAAkB,GAC/B,OAAO,CAAC,eAAe,CAAC,CAmD1B"}

package/dist/es2017/main_thread/decrypt/get_media_keys.js

@@ -53,7 +53,7 @@ export default async function getMediaKeysInfos(mediaElement, keySystemsConfigs,
     if (cancelSignal.cancellationError !== null) {
         throw cancelSignal.cancellationError;
     }
-    const { options, mediaKeySystemAccess, codecSupport } = evt.value;
+    const { options, mediaKeySystemAccess, askedConfiguration, codecSupport } = evt.value;
     const currentState = MediaKeysInfosStore.getState(mediaElement);
     const persistentSessionsStore = createPersistentSessionsStorage(options);
     if (canReuseMediaKeys() &&
@@ -69,6 +69,7 @@ export default async function getMediaKeysInfos(mediaElement, keySystemsConfigs,
             return {
                 mediaKeys,
                 mediaKeySystemAccess,
+                askedConfiguration,
                 stores: { loadedSessionsStore, persistentSessionsStore },
                 options,
                 codecSupport,
@@ -81,6 +82,7 @@ export default async function getMediaKeysInfos(mediaElement, keySystemsConfigs,
     return {
         mediaKeys,
         mediaKeySystemAccess,
+        askedConfiguration,
         stores: { loadedSessionsStore, persistentSessionsStore },
         options,
         codecSupport,

package/dist/es2017/main_thread/decrypt/utils/media_keys_infos_store.d.ts

@@ -22,6 +22,11 @@ export interface IMediaElementMediaKeysInfos {
     emeImplementation: IEmeApiImplementation;
     /** Last keySystemOptions used with that HTMLMediaElement. */
     keySystemOptions: IKeySystemOption;
+    /**
+     * The actual MediaKeySystemConfiguration asked to the
+     * `requestMediaKeySystemAccess` API.
+     */
+    askedConfiguration: MediaKeySystemConfiguration;
     /**
      * Last MediaKeySystemAccess used to create a MediaKeys bound to that
      * HTMLMediaElement.

package/dist/es2017/main_thread/decrypt/utils/media_keys_infos_store.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"media_keys_infos_store.d.ts","sourceRoot":"","sources":["../../../../../src/main_thread/decrypt/utils/media_keys_infos_store.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6CAA6C,CAAC;AACjF,OAAO,KAAK,EACV,gBAAgB,EAChB,2BAA2B,EAC3B,qBAAqB,EACtB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAC9D,OAAO,KAAK,mBAAmB,MAAM,yBAAyB,CAAC;AAE/D,6EAA6E;AAC7E,MAAM,WAAW,2BAA2B;IAC1C,iBAAiB,EAAE,qBAAqB,CAAC;IAEzC,6DAA6D;IAC7D,gBAAgB,EAAE,gBAAgB,CAAC;IAEnC;;;OAGG;IACH,oBAAoB,EAAE,2BAA2B,GAAG,oBAAoB,CAAC;IAEzE,8DAA8D;IAC9D,SAAS,EAAE,SAAS,GAAG,gBAAgB,CAAC;IAExC;;;OAGG;IACH,mBAAmB,EAAE,mBAAmB,CAAC;CAC1C;;IASC;;;;OAIG;2BACoB,aAAa,SAAS,2BAA2B,GAAG,IAAI,GAAG,IAAI;IAItF;;;;OAIG;2BACoB,aAAa,GAAG,2BAA2B,GAAG,IAAI;IAKzE;;;OAGG;6BACsB,aAAa,GAAG,IAAI;;AAxB/C,wBA2BE"}
+{"version":3,"file":"media_keys_infos_store.d.ts","sourceRoot":"","sources":["../../../../../src/main_thread/decrypt/utils/media_keys_infos_store.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6CAA6C,CAAC;AACjF,OAAO,KAAK,EACV,gBAAgB,EAChB,2BAA2B,EAC3B,qBAAqB,EACtB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAC9D,OAAO,KAAK,mBAAmB,MAAM,yBAAyB,CAAC;AAE/D,6EAA6E;AAC7E,MAAM,WAAW,2BAA2B;IAC1C,iBAAiB,EAAE,qBAAqB,CAAC;IAEzC,6DAA6D;IAC7D,gBAAgB,EAAE,gBAAgB,CAAC;IAEnC;;;OAGG;IACH,kBAAkB,EAAE,2BAA2B,CAAC;IAEhD;;;OAGG;IACH,oBAAoB,EAAE,2BAA2B,GAAG,oBAAoB,CAAC;IAEzE,8DAA8D;IAC9D,SAAS,EAAE,SAAS,GAAG,gBAAgB,CAAC;IAExC;;;OAGG;IACH,mBAAmB,EAAE,mBAAmB,CAAC;CAC1C;;IASC;;;;OAIG;2BACoB,aAAa,SAAS,2BAA2B,GAAG,IAAI,GAAG,IAAI;IAItF;;;;OAIG;2BACoB,aAAa,GAAG,2BAA2B,GAAG,IAAI;IAKzE;;;OAGG;6BACsB,aAAa,GAAG,IAAI;;AAxB/C,wBA2BE"}