Bug 1872973 - part1 : use default config for clearkey. r=jolin

For the media fundation based CDMs, we usually use WMFCDMImpl to get a
capabilities from the MFCDM process in order to get a precise
capabilites result from CDMs.

However, for clearkey, it's all implemented by ourselves and its
capabilites always keep the same, so we can simply just use our
predefined capabilites without asking the MFCDM process.

Differential Revision: https://phabricator.services.mozilla.com/D197763
This commit is contained in:
alwu 2024-01-08 02:37:03 +00:00
parent 897281f245
commit 0ee6499075

View File

@ -74,11 +74,7 @@ bool KeySystemConfig::CreateKeySystemConfigs(
return false;
}
bool useGMPClearKey = true;
#ifdef MOZ_WMF_CDM
useGMPClearKey = !StaticPrefs::media_eme_wmf_clearkey_enabled();
#endif
if (IsClearkeyKeySystem(aKeySystem) && useGMPClearKey) {
if (IsClearkeyKeySystem(aKeySystem)) {
KeySystemConfig* config = aOutConfigs.AppendElement();
config->mKeySystem = aKeySystem;
config->mInitDataTypes.AppendElement(u"cenc"_ns);
@ -211,8 +207,7 @@ bool KeySystemConfig::CreateKeySystemConfigs(
}
#ifdef MOZ_WMF_CDM
if (IsPlayReadyKeySystemAndSupported(aKeySystem) ||
IsWidevineExperimentKeySystemAndSupported(aKeySystem) ||
IsWMFClearKeySystemAndSupported(aKeySystem)) {
IsWidevineExperimentKeySystemAndSupported(aKeySystem)) {
RefPtr<WMFCDMImpl> cdm = MakeRefPtr<WMFCDMImpl>(aKeySystem);
return cdm->GetCapabilities(aOutConfigs);
}