зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1207439 - Don't use GMPVideoDecoderTrialCreator for Primetime. r=edwin
This commit is contained in:
Родитель
b6115339aa
Коммит
dc7d7fd07d
|
@ -78,18 +78,13 @@ MediaKeySystemAccessManager::Request(DetailedPromise* aPromise,
|
||||||
static bool
|
static bool
|
||||||
ShouldTrialCreateGMP(const nsAString& aKeySystem)
|
ShouldTrialCreateGMP(const nsAString& aKeySystem)
|
||||||
{
|
{
|
||||||
// Trial create where the CDM has a decoder;
|
// Trial create where the CDM has a Windows Media Foundation decoder.
|
||||||
// * ClearKey and Primetime on Windows Vista and later.
|
|
||||||
// * Primetime on MacOSX Lion and later.
|
|
||||||
return
|
|
||||||
Preferences::GetBool("media.gmp.trial-create.enabled", false) &&
|
|
||||||
#ifdef XP_WIN
|
#ifdef XP_WIN
|
||||||
IsVistaOrLater();
|
return Preferences::GetBool("media.gmp.trial-create.enabled", false) &&
|
||||||
#elif defined(XP_MACOSX)
|
aKeySystem.EqualsLiteral("org.w3.clearkey") &&
|
||||||
aKeySystem.EqualsLiteral("com.adobe.primetime") &&
|
IsVistaOrLater();
|
||||||
nsCocoaFeatures::OnLionOrLater();
|
|
||||||
#else
|
#else
|
||||||
false;
|
return false;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче