Bug 1271883 - Add Widevine keysystem to sGMPCodecs. r?jwwang draft
authorChris Pearce <cpearce@mozilla.com>
Wed, 11 May 2016 16:49:24 +1200
changeset 365585 339f3458e5ce0152e5f09511bf18e9a6bc188517
parent 365494 674a552743785c28c75866969aad513bd8eaf6ae
child 520605 59670fd2bb66f5e5803113ae17499c5f9b7769e2
push id17795
push usercpearce@mozilla.com
push dateWed, 11 May 2016 04:51:20 +0000
reviewersjwwang
bugs1271883, 1271242
milestone49.0a1
Bug 1271883 - Add Widevine keysystem to sGMPCodecs. r?jwwang I broke Widevine in 1271242 when I changed EMEDecoderModule::SupportsMimeType() to call GMPDecoderModule::SupportsMimeType() specifying a GMP to use, as I didn't add the widevine keysystem to the take of keysystems that we recognise in GMPDecoderModule. So we're unable to create an EME MediaDataDecoder. In order to make Widevine EME work again, we need the Widevine keysystem string in sGMPCodecs in GMPDecoderModule.cpp. MozReview-Commit-ID: 6bJwsoGYIyL
dom/media/platforms/agnostic/gmp/GMPDecoderModule.cpp
--- a/dom/media/platforms/agnostic/gmp/GMPDecoderModule.cpp
+++ b/dom/media/platforms/agnostic/gmp/GMPDecoderModule.cpp
@@ -151,16 +151,17 @@ struct GMPCodecs {
   const char* mKeySystem;
   bool mHasAAC;
   bool mHasH264;
 };
 
 static GMPCodecs sGMPCodecs[] = {
   { "org.w3.clearkey", false, false },
   { "com.adobe.primetime", false, false },
+  { "com.widevine.alpha", false, false },
 };
 
 void
 GMPDecoderModule::UpdateUsableCodecs()
 {
   MOZ_ASSERT(NS_IsMainThread());
 
   StaticMutexAutoLock lock(sGMPCodecsMutex);