Bug 1129229 - Recognize com.adobe.primetime keysystem string. r=edwin a=lmandel
authorChris Pearce <cpearce@mozilla.com>
Thu, 05 Feb 2015 09:36:44 +1300
changeset 250197 949ce3e9c42e
parent 250196 336529d8cd1a
child 250198 f2e35a9f30a7
push id4521
push usercpearce@mozilla.com
push date2015-03-04 01:22 +0000
treeherdermozilla-beta@8abdbdecd2d6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersedwin, lmandel
bugs1129229
milestone37.0
Bug 1129229 - Recognize com.adobe.primetime keysystem string. r=edwin a=lmandel
dom/media/eme/MediaKeySystemAccess.cpp
--- a/dom/media/eme/MediaKeySystemAccess.cpp
+++ b/dom/media/eme/MediaKeySystemAccess.cpp
@@ -102,21 +102,22 @@ MediaKeySystemAccess::IsKeySystemSupport
   if (aKeySystem.EqualsLiteral("org.w3.clearkey") &&
       HaveGMPFor(mps,
                  NS_LITERAL_CSTRING("org.w3.clearkey"),
                  NS_LITERAL_CSTRING(GMP_API_DECRYPTOR))) {
     return true;
   }
 
 #ifdef XP_WIN
-  if (aKeySystem.EqualsLiteral("com.adobe.access") &&
+  if ((aKeySystem.EqualsLiteral("com.adobe.access") ||
+       aKeySystem.EqualsLiteral("com.adobe.primetime")) &&
       Preferences::GetBool("media.gmp-eme-adobe.enabled", false) &&
       IsVistaOrLater() && // Win Vista and later only.
       HaveGMPFor(mps,
-                 NS_LITERAL_CSTRING("com.adobe.access"),
+                 NS_ConvertUTF16toUTF8(aKeySystem),
                  NS_LITERAL_CSTRING(GMP_API_DECRYPTOR))) {
       return true;
   }
 #endif
 
   return false;
 }