Bug 1338064 - Enable VP9 in MP4 for EME in Nightly. r=gerald

MozReview-Commit-ID: Deggrc038Va

--HG--
extra : rebase_source : cebfafbfec26bc0c756b85c9cde214455979f374

browser/app/profile/firefox.js

@@ -1377,6 +1377,12 @@ pref("media.eme.enabled", false);
 pref("media.eme.enabled", true);
 #endif
 
+#ifdef NIGHTLY_BUILD
+pref("media.eme.vp9-in-mp4.enabled", true);
+#else
+pref("media.eme.vp9-in-mp4.enabled", false);
+#endif
+
 // Whether we should run a test-pattern through EME GMPs before assuming they'll
 // decode H.264.
 pref("media.gmp.trial-create.enabled", true);

dom/media/eme/MediaKeySystemAccess.cpp

@@ -287,6 +287,9 @@ GetSupportedKeySystems()
       clearkey.mMP4.SetCanDecrypt(EME_CODEC_AAC);
       clearkey.mMP4.SetCanDecrypt(EME_CODEC_H264);
 #endif
+      if (Preferences::GetBool("media.eme.vp9-in-mp4.enabled", false)) {
+        clearkey.mMP4.SetCanDecrypt(EME_CODEC_VP9);
+      }
       clearkey.mWebM.SetCanDecrypt(EME_CODEC_VORBIS);
       clearkey.mWebM.SetCanDecrypt(EME_CODEC_OPUS);
       clearkey.mWebM.SetCanDecrypt(EME_CODEC_VP8);
@@ -336,6 +339,7 @@ GetSupportedKeySystems()
 
       DataForValidation validationList[] = {
         { nsCString("video/mp4"), EME_CODEC_H264, MediaDrmProxy::AVC, &widevine.mMP4 },
+        { nsCString("video/mp4"), EME_CODEC_VP9, MediaDrmProxy::AVC, &widevine.mMP4 },
         { nsCString("audio/mp4"), EME_CODEC_AAC, MediaDrmProxy::AAC, &widevine.mMP4 },
         { nsCString("video/webm"), EME_CODEC_VP8, MediaDrmProxy::VP8, &widevine.mWebM },
         { nsCString("video/webm"), EME_CODEC_VP9, MediaDrmProxy::VP9, &widevine.mWebM},
@@ -355,6 +359,9 @@ GetSupportedKeySystems()
       }
 #else
       widevine.mMP4.SetCanDecryptAndDecode(EME_CODEC_H264);
+      if (Preferences::GetBool("media.eme.vp9-in-mp4.enabled", false)) {
+        widevine.mMP4.SetCanDecryptAndDecode(EME_CODEC_VP9);
+      }
       widevine.mWebM.SetCanDecrypt(EME_CODEC_VORBIS);
       widevine.mWebM.SetCanDecrypt(EME_CODEC_OPUS);
       widevine.mWebM.SetCanDecryptAndDecode(EME_CODEC_VP8);