Skip to content

DRM: Only check cached MediaKeySystemAccess compatibility with most w… #1591

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 8, 2024
Merged

DRM: Only check cached MediaKeySystemAccess compatibility with most w… #1591

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
115 changes: 55 additions & 60 deletions src/main_thread/decrypt/find_key_system.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,13 +88,14 @@ interface IKeySystemType {
}

/**
* @param {Array.<Object>} keySystems
* @param {Object} keySystem
* @param {Object} askedConfiguration
* @param {MediaKeySystemAccess} currentKeySystemAccess
* @param {Object} currentKeySystemOptions
* @returns {null|Object}
*/
function checkCachedMediaKeySystemAccess(
keySystems: IKeySystemOption[],
keySystem: IKeySystemOption,
askedConfiguration: MediaKeySystemConfiguration,
currentKeySystemAccess: MediaKeySystemAccess | ICustomMediaKeySystemAccess,
currentKeySystemOptions: IKeySystemOption,
Expand All @@ -108,38 +109,31 @@ function checkCachedMediaKeySystemAccess(
return null;
}

const firstCompatibleOption = keySystems.filter((ks) => {
// TODO Do it with MediaKeySystemAccess.prototype.keySystem instead
if (ks.type !== currentKeySystemOptions.type) {
return false;
}

if (
(!isNullOrUndefined(ks.persistentLicenseConfig) ||
ks.persistentState === "required") &&
mksConfiguration.persistentState !== "required"
) {
return false;
}

if (
ks.distinctiveIdentifier === "required" &&
mksConfiguration.distinctiveIdentifier !== "required"
) {
return false;
}
// TODO Do it with MediaKeySystemAccess.prototype.keySystem instead
if (keySystem.type !== currentKeySystemOptions.type) {
return null;
}

return true;
})[0];
if (
(!isNullOrUndefined(keySystem.persistentLicenseConfig) ||
keySystem.persistentState === "required") &&
mksConfiguration.persistentState !== "required"
) {
return null;
}

if (firstCompatibleOption !== undefined) {
return {
keySystemOptions: firstCompatibleOption,
keySystemAccess: currentKeySystemAccess,
askedConfiguration,
};
if (
keySystem.distinctiveIdentifier === "required" &&
mksConfiguration.distinctiveIdentifier !== "required"
) {
return null;
}
return null;

return {
keySystemOptions: keySystem,
keySystemAccess: currentKeySystemAccess,
askedConfiguration,
};
}

/**
Expand Down Expand Up @@ -390,35 +384,6 @@ export default function getMediaKeySystemAccess(
cancelSignal: CancellationSignal,
): Promise<IFoundMediaKeySystemAccessEvent> {
log.info("DRM: Searching for compatible MediaKeySystemAccess");
const currentState = MediaKeysInfosStore.getState(mediaElement);
if (currentState !== null) {
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.askedConfiguration,
currentState.mediaKeySystemAccess,
currentState.keySystemOptions,
);
if (cachedKeySystemAccess !== null) {
log.info("DRM: Found cached compatible keySystem");
return Promise.resolve({
type: "reuse-media-key-system-access" as const,
value: {
mediaKeySystemAccess: cachedKeySystemAccess.keySystemAccess,
askedConfiguration: cachedKeySystemAccess.askedConfiguration,
options: cachedKeySystemAccess.keySystemOptions,
codecSupport: extractCodecSupportListFromConfiguration(
cachedKeySystemAccess.askedConfiguration,
cachedKeySystemAccess.keySystemAccess.getConfiguration(),
),
},
});
}
}
}

/**
* Array of set keySystems for this content.
* Each item of this array is an object containing the following keys:
Expand Down Expand Up @@ -479,6 +444,36 @@ export default function getMediaKeySystemAccess(
}

const chosenType = keySystemsType[index];

const currentState = MediaKeysInfosStore.getState(mediaElement);
if (currentState !== null) {
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(
chosenType.keySystemOptions,
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" as const,
value: {
mediaKeySystemAccess: cachedKeySystemAccess.keySystemAccess,
askedConfiguration: cachedKeySystemAccess.askedConfiguration,
options: cachedKeySystemAccess.keySystemOptions,
codecSupport: extractCodecSupportListFromConfiguration(
cachedKeySystemAccess.askedConfiguration,
cachedKeySystemAccess.keySystemAccess.getConfiguration(),
),
},
});
}
}
}

const { keyType, keySystemOptions } = chosenType;

const keySystemConfigurations = buildKeySystemConfigurations(chosenType);
Expand Down
Loading