Bug 1527811 - Hide OpenH264 by default on Windows on ARM. r=dminor,r=Gijs

We don't have an aarch64 build of OpenH264 yet, and WebRTC on aarch64 is
blocked by DirectShow support from MS, so just hide OpenH264 from the addons
manager UI for now.

We achieve this by moving the isEME() check in GMPUtils.isPluginHidden() down
to after the isPluginSupported()||isPluginVisible() check, so we can use
the media.gmp-gmpopenh264.visible pref to hide OpenH264 in the addons
manager.

When we are ready to enable WebRTC, we can flip the pref.

Differential Revision: https://phabricator.services.mozilla.com/D19903

--HG--
extra : source : 2788a3e0544a3acba9de53165605496d8c357441
extra : intermediate-source : 35bdf7e8994c939d6fcd01e95c2183bacd5b11d3
extra : histedit_source : a8bdb3a1cb6bfd7c72dbbf1fae36c863e6fe5144
This commit is contained in:
Chris Pearce 2019-02-15 13:25:38 +13:00
parent 4d52a6a8f4
commit f4dc9b5b3d
2 changed files with 13 additions and 3 deletions

View File

@ -1468,6 +1468,15 @@ pref("media.gmp-widevinecdm.visible", true);
pref("media.gmp-widevinecdm.enabled", true);
#endif
#if defined(_ARM64_) && defined(XP_WIN)
// Windows on ARM64, OpenH264 not available yet.
pref("media.gmp-gmpopenh264.visible", false);
pref("media.gmp-gmpopenh264.enabled", false);
#else
// Not Windows on ARM64
pref("media.gmp-gmpopenh264.visible", true);
pref("media.gmp-gmpopenh264.enabled", true);
#endif
// Switch block autoplay logic to v2, and enable UI.
pref("media.autoplay.enabled.user-gestures-needed", true);

View File

@ -32,15 +32,16 @@ var GMPUtils = {
// See bug 1291537.
return true;
}
if (!aPlugin.isEME) {
return false;
}
if (!this._isPluginSupported(aPlugin) ||
!this._isPluginVisible(aPlugin)) {
return true;
}
if (!aPlugin.isEME) {
return false;
}
if (!GMPPrefs.getBool(GMPPrefs.KEY_EME_ENABLED, true)) {
return true;
}