Bug 1325332 - [EME][Fennec] Pref on EME API and only support it for M+ android version. r=cpearce
☠☠ backed out by b1576b5adad1 ☠ ☠
authorJames Cheng <jacheng@mozilla.com>
Fri, 23 Dec 2016 15:50:13 +0800
changeset 328487 c273666082fac0829db0ec585247dc8914abab61
parent 328486 6430db56569c0af578643f9f11861e52e4201095
child 328488 68c4261192aceca8deb4db9d50d5c65b3f0bf5b3
push id31174
push usercbook@mozilla.com
push dateMon, 09 Jan 2017 09:32:17 +0000
treeherdermozilla-central@97896f92f196 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerscpearce
bugs1325332
milestone53.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1325332 - [EME][Fennec] Pref on EME API and only support it for M+ android version. r=cpearce MozReview-Commit-ID: Bi5pRhIFsxB
mobile/android/app/mobile.js
mobile/android/base/java/org/mozilla/gecko/media/MediaDrmProxy.java
--- a/mobile/android/app/mobile.js
+++ b/mobile/android/app/mobile.js
@@ -632,16 +632,22 @@ pref("media.android-remote-codec.enabled
 pref("media.android-remote-codec.enabled", false);
 #endif
 
 // Enable MSE
 pref("media.mediasource.enabled", true);
 
 pref("media.mediadrm-widevinecdm.visible", true);
 
+#ifdef NIGHTLY_BUILD
+// Enable EME(Encrypted media extensions)
+pref("media.eme.enabled", true);
+pref("media.eme.apiVisible", true);
+#endif
+
 // optimize images memory usage
 pref("image.downscale-during-decode.enabled", true);
 
 pref("browser.safebrowsing.downloads.enabled", false);
 
 pref("browser.safebrowsing.id", @MOZ_APP_UA_NAME@);
 
 // True if this is the first time we are showing about:firstrun
--- a/mobile/android/base/java/org/mozilla/gecko/media/MediaDrmProxy.java
+++ b/mobile/android/base/java/org/mozilla/gecko/media/MediaDrmProxy.java
@@ -42,18 +42,18 @@ public final class MediaDrmProxy {
     public static final ArrayList<MediaDrmProxy> sProxyList = new ArrayList<MediaDrmProxy>();
 
     // A flag to avoid using the native object that has been destroyed.
     private boolean mDestroyed;
     private GeckoMediaDrm mImpl;
     private String mDrmStubId;
 
     private static boolean isSystemSupported() {
-        // Support versions >= LOLLIPOP
-        if (AppConstants.Versions.preLollipop) {
+        // Support versions >= Marshmallow
+        if (AppConstants.Versions.preMarshmallow) {
             if (DEBUG) Log.d(LOGTAG, "System Not supported !!, current SDK version is " + Build.VERSION.SDK_INT);
             return false;
         }
         return true;
     }
 
     @WrapForJNI
     public static boolean isSchemeSupported(String keySystem) {