Bug 1159495 - Only report Adobe EME supported if required WMF codecs …

…are installed. r=edwin, a=sledru
mozilla · Apr 29, 2015 · 4b9c7f0 · 4b9c7f0
1 parent ce4bbd1
commit 4b9c7f0
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/dom/media/eme/MediaKeySystemAccess.cpp b/dom/media/eme/MediaKeySystemAccess.cpp
@@ -13,6 +13,7 @@
 #endif
 #ifdef XP_WIN
 #include "mozilla/WindowsVersion.h"
+#include "WMFDecoderModule.h"
 #endif
 #include "nsContentCID.h"
 #include "nsServiceManagerUtils.h"
@@ -155,6 +156,11 @@ MediaKeySystemAccess::GetKeySystemStatus(const nsAString& aKeySystem,
     if (!Preferences::GetBool("media.gmp-eme-adobe.enabled", false)) {
       return MediaKeySystemStatus::Cdm_disabled;
     }
+    if (!WMFDecoderModule::HasH264() || !WMFDecoderModule::HasAAC()) {
+      // The system doesn't have the codecs that Adobe EME relies
+      // on installed.
+      return MediaKeySystemStatus::Cdm_not_supported;
+    }
     if (!HaveGMPFor(mps,
                     NS_ConvertUTF16toUTF8(aKeySystem),
                     NS_LITERAL_CSTRING(GMP_API_DECRYPTOR)) &&