Bug 1314192 - Initialize the normal WMF PDM as well as the Remote one since we need it as fallback for audio. r=jya
authorMatt Woodrow <mwoodrow@mozilla.com>
Thu, 03 Nov 2016 09:57:18 +1300
changeset 347417 add599162c984ee487eef7940b8cf0365c8576b4
parent 347416 455ab84d9644452467966094368f8ef979b05086
child 347418 96c3388d513e16304fdd628c68aa7525c4c4e6c8
push id10298
push userraliiev@mozilla.com
push dateMon, 14 Nov 2016 12:33:03 +0000
treeherdermozilla-aurora@7e29173b1641 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjya
bugs1314192
milestone52.0a1
Bug 1314192 - Initialize the normal WMF PDM as well as the Remote one since we need it as fallback for audio. r=jya
dom/media/platforms/PDMFactory.cpp
--- a/dom/media/platforms/PDMFactory.cpp
+++ b/dom/media/platforms/PDMFactory.cpp
@@ -369,20 +369,18 @@ PDMFactory::CreatePDMs()
     // compatibility mode on Windows 7 (it does happen!) we may crash trying
     // to startup WMF. So we need to detect the OS version here, as in
     // compatibility mode IsVistaOrLater() and friends behave as if we're on
     // the emulated version of Windows. See bug 1279171.
     // Additionally, we don't want to start the RemoteDecoderModule if we
     // expect it's not going to work (i.e. on Windows older than Vista).
     m = new WMFDecoderModule();
     RefPtr<PlatformDecoderModule> remote = new dom::RemoteDecoderModule(m);
-    mWMFFailedToLoad = !StartupPDM(remote);
-    if (mWMFFailedToLoad) {
-      mWMFFailedToLoad = !StartupPDM(m);
-    }
+    StartupPDM(remote);
+    mWMFFailedToLoad = !StartupPDM(m);
   } else {
     mWMFFailedToLoad = MediaPrefs::DecoderDoctorWMFDisabledIsFailure();
   }
 #endif
 #ifdef MOZ_FFVPX
   if (MediaPrefs::PDMFFVPXEnabled()) {
     m = FFVPXRuntimeLinker::CreateDecoderModule();
     StartupPDM(m);