зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1329543 - Remove use of gmp-eme-adobe* prefs from Gecko. r=gerald
MozReview-Commit-ID: 1CnwuGGJ9Jo --HG-- extra : rebase_source : 99c285160b06a7557f58243bd97f993a13add608
This commit is contained in:
Родитель
75fbf5ab95
Коммит
9fde9fe382
|
@ -134,16 +134,6 @@ MediaKeySystemAccess::GetKeySystemStatus(const nsAString& aKeySystem,
|
|||
return EnsureCDMInstalled(aKeySystem, aOutMessage);
|
||||
}
|
||||
|
||||
if (Preferences::GetBool("media.gmp-eme-adobe.visible", false)) {
|
||||
if (IsPrimetimeKeySystem(aKeySystem)) {
|
||||
if (!Preferences::GetBool("media.gmp-eme-adobe.enabled", false)) {
|
||||
aOutMessage = NS_LITERAL_CSTRING("Adobe EME disabled");
|
||||
return MediaKeySystemStatus::Cdm_disabled;
|
||||
}
|
||||
return EnsureCDMInstalled(aKeySystem, aOutMessage);
|
||||
}
|
||||
}
|
||||
|
||||
if (IsWidevineKeySystem(aKeySystem)) {
|
||||
if (Preferences::GetBool("media.gmp-widevinecdm.visible", false)) {
|
||||
if (!Preferences::GetBool("media.gmp-widevinecdm.enabled", false)) {
|
||||
|
@ -324,9 +314,8 @@ GetSupportedKeySystems()
|
|||
#if defined(XP_WIN)
|
||||
// Widevine CDM doesn't include an AAC decoder. So if WMF can't
|
||||
// decode AAC, and a codec wasn't specified, be conservative
|
||||
// and reject the MediaKeys request, since our policy is to prevent
|
||||
// the Adobe GMP's unencrypted AAC decoding path being used to
|
||||
// decode content decrypted by the Widevine CDM.
|
||||
// and reject the MediaKeys request, since we assume Widevine
|
||||
// will be used with AAC.
|
||||
if (WMFDecoderModule::HasAAC()) {
|
||||
widevine.mMP4.SetCanDecrypt(EME_CODEC_AAC);
|
||||
}
|
||||
|
@ -453,9 +442,8 @@ CanDecryptAndDecode(const nsString& aKeySystem,
|
|||
#if defined(XP_WIN)
|
||||
// Widevine CDM doesn't include an AAC decoder. So if WMF can't
|
||||
// decode AAC, and a codec wasn't specified, be conservative
|
||||
// and reject the MediaKeys request, since our policy is to prevent
|
||||
// the Adobe GMP's unencrypted AAC decoding path being used to
|
||||
// decode content decrypted by the Widevine CDM.
|
||||
// and reject the MediaKeys request, since we assume Widevine
|
||||
// will be used with AAC.
|
||||
if (codec == EME_CODEC_AAC &&
|
||||
IsWidevineKeySystem(aKeySystem) &&
|
||||
!WMFDecoderModule::HasAAC()) {
|
||||
|
|
Загрузка…
Ссылка в новой задаче