Bug 1185782 - Remove media.windows-media-foundation.enabled pref. r=jya

dom/media/platforms/wmf/WMFDecoderModule.cpp

@@ -23,7 +23,6 @@
 
 namespace mozilla {
 
-static bool sIsWMFEnabled = false;
 static bool sDXVAEnabled = false;
 static int  sNumDecoderThreads = -1;
 static bool sIsIntelDecoderEnabled = false;
@@ -72,7 +71,6 @@ void
 WMFDecoderModule::Init()
 {
   MOZ_ASSERT(NS_IsMainThread(), "Must be on main thread.");
-  sIsWMFEnabled = Preferences::GetBool("media.windows-media-foundation.enabled", false);
   sDXVAEnabled = gfxPlatform::GetPlatform()->CanUseHardwareVideoDecoding();
   sIsIntelDecoderEnabled = Preferences::GetBool("media.webm.intel_decoder.enabled", false);
   SetNumOfDecoderThreads();
@@ -88,9 +86,7 @@ WMFDecoderModule::GetNumDecoderThreads()
 nsresult
 WMFDecoderModule::Startup()
 {
-  if (sIsWMFEnabled) {
-    mWMFInitialized = SUCCEEDED(wmf::MFStartup());
-  }
+  mWMFInitialized = SUCCEEDED(wmf::MFStartup());
   return mWMFInitialized ? NS_OK : NS_ERROR_FAILURE;
 }
 

dom/media/test/test_can_play_type_mpeg.html

@@ -40,12 +40,12 @@ function check_mp4(v, enabled) {
 
   // H.264 Constrained Baseline Profile Level 3.0, mp3
   check("video/mp4; codecs=\"avc1.42E01E, mp3\"", "probably");
-  
+
   check("video/mp4; codecs=\"avc1.42001E, mp4a.40.2\"", "probably");
   check("video/mp4; codecs=\"avc1.58A01E, mp4a.40.2\"", "probably");
-  
+
   const ProbablyIfNotLinux = !IsLinuxGStreamer() ? "probably" : "";
-  
+
   // H.264 Main Profile Level 3.0, AAC-LC
   check("video/mp4; codecs=\"avc1.4D401E, mp4a.40.2\"", "probably");
   // H.264 Main Profile Level 3.1, AAC-LC
@@ -74,7 +74,7 @@ function check_mp4(v, enabled) {
   check("audio/mp4; codecs=mp4a.40.5", ProbablyIfNotLinux);
   check("audio/x-m4a; codecs=\"mp4a.40.5\"", ProbablyIfNotLinux);
   check("audio/x-m4a; codecs=mp4a.40.5", ProbablyIfNotLinux);
-  
+
 }
 
 function check_mp3(v, enabled) {
@@ -134,12 +134,12 @@ function IsMP4ReaderAvailable() {
   return prefs && (IsWindowsVistaOrLater() || IsMacOSSnowLeopardOrLater() || IsJellyBeanOrLater());
 }
 
-var haveMp4 = (getPref("media.windows-media-foundation.enabled") && IsWindowsVistaOrLater()) ||
-               getPref("media.omx.enabled") ||
-               getPref("media.gstreamer.enabled") ||
-               IsMP4ReaderAvailable();
+var haveMp4 = IsWindowsVistaOrLater() ||
+              getPref("media.omx.enabled") ||
+              getPref("media.gstreamer.enabled") ||
+              IsMP4ReaderAvailable();
 // TODO:  Add "getPref("media.plugins.enabled")" once MP4 works on Gingerbread.
-             
+
 check_mp4(document.getElementById('v'), haveMp4);
 
 var haveMp3 = getPref("media.directshow.enabled") ||

modules/libpref/init/all.js

@@ -289,7 +289,6 @@ pref("media.decoder.heuristic.dormant.enabled", true);
 pref("media.decoder.heuristic.dormant.timeout", 60000);
 
 #ifdef MOZ_WMF
-pref("media.windows-media-foundation.enabled", true);
 pref("media.wmf.decoder.thread-count", -1);
 #endif
 #ifdef MOZ_DIRECTSHOW