Bug 1214932 - Add media.wmf.enabled pref. r=jya

dom/media/platforms/PDMFactory.cpp

@@ -56,6 +56,9 @@ bool PDMFactory::sGMPDecoderEnabled = false;
 #ifdef MOZ_FFMPEG
 bool PDMFactory::sFFmpegDecoderEnabled = false;
 #endif
+#ifdef XP_WIN
+bool PDMFactory::sWMFDecoderEnabled = false;
+#endif
 
 bool PDMFactory::sEnableFuzzingWrapper = false;
 uint32_t PDMFactory::sVideoOutputMinimumInterval_ms = 0;
@@ -91,6 +94,10 @@ PDMFactory::Init()
   Preferences::AddBoolVarCache(&sFFmpegDecoderEnabled,
                                "media.ffmpeg.enabled", false);
 #endif
+#ifdef XP_WIN
+  Preferences::AddBoolVarCache(&sWMFDecoderEnabled,
+                               "media.wmf.enabled", false);
+#endif
 
   Preferences::AddBoolVarCache(&sEnableFuzzingWrapper,
                                "media.decoder.fuzzing.enabled", false);
@@ -212,8 +219,10 @@ PDMFactory::CreatePDMs()
   }
 #endif
 #ifdef XP_WIN
-  m = new WMFDecoderModule();
-  StartupPDM(m);
+  if (sWMFDecoderEnabled) {
+    m = new WMFDecoderModule();
+    StartupPDM(m);
+  }
 #endif
 #ifdef MOZ_FFMPEG
   if (sFFmpegDecoderEnabled) {

dom/media/platforms/PDMFactory.h

@@ -66,6 +66,9 @@ private:
   static bool sGMPDecoderEnabled;
 #ifdef MOZ_FFMPEG
   static bool sFFmpegDecoderEnabled;
+#endif
+#ifdef XP_WIN
+  static bool sWMFDecoderEnabled;
 #endif
   static bool sEnableFuzzingWrapper;
   static uint32_t sVideoOutputMinimumInterval_ms;