Bug 848994 - p2. Detect when WMF is not found - r=cpearce

MozReview-Commit-ID: IHvgJNjuyQA
mozilla-spidermonkey · Apr 22, 2016 · c3e9d00 · c3e9d00
1 parent 9df8db2
commit c3e9d00
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 1 deletion.
diff --git a/dom/media/DecoderDoctorDiagnostics.cpp b/dom/media/DecoderDoctorDiagnostics.cpp
@@ -446,6 +446,9 @@ DecoderDoctorDiagnostics::GetDescription() const
     s = "format='";
     s += NS_ConvertUTF16toUTF8(mFormat).get();
     s += mCanPlay ? "', can play" : "', cannot play";
+    if (mWMFFailedToLoad) {
+      s += ", Windows platform decoder failed to load";
+    }
     if (mFFmpegFailedToLoad) {
       s += ", Linux platform decoder failed to load";
     }

diff --git a/dom/media/DecoderDoctorDiagnostics.h b/dom/media/DecoderDoctorDiagnostics.h
@@ -48,6 +48,9 @@ class DecoderDoctorDiagnostics
   const nsAString& Format() const { return mFormat; }
   bool CanPlay() const { return mCanPlay; }
 
+  void SetWMFFailedToLoad() { mWMFFailedToLoad = true; }
+  bool DidWMFFailToLoad() const { return mWMFFailedToLoad; }
+
   void SetFFmpegFailedToLoad() { mFFmpegFailedToLoad = true; }
   bool DidFFmpegFailToLoad() const { return mFFmpegFailedToLoad; }
 
@@ -56,6 +59,7 @@ class DecoderDoctorDiagnostics
   // True if there is at least one decoder that can play that format.
   bool mCanPlay = false;
 
+  bool mWMFFailedToLoad = false;
   bool mFFmpegFailedToLoad = false;
 };
 

diff --git a/dom/media/platforms/PDMFactory.cpp b/dom/media/platforms/PDMFactory.cpp
@@ -165,6 +165,9 @@ PDMFactory::CreateDecoder(const TrackInfo& aConfig,
   if (aDiagnostics) {
     // If libraries failed to load, the following loop over mCurrentPDMs
     // will not even try to use them. So we record failures now.
+    if (mWMFFailedToLoad) {
+      aDiagnostics->SetWMFFailedToLoad();
+    }
     if (mFFmpegFailedToLoad) {
       aDiagnostics->SetFFmpegFailedToLoad();
     }
@@ -290,7 +293,9 @@ PDMFactory::CreatePDMs()
 #ifdef XP_WIN
   if (sWMFDecoderEnabled) {
     m = new WMFDecoderModule();
-    StartupPDM(m);
+    if (!StartupPDM(m)) {
+      mWMFFailedToLoad = true;
+    }
   }
 #endif
 #ifdef MOZ_FFVPX
@@ -350,6 +355,9 @@ PDMFactory::GetDecoder(const nsACString& aMimeType,
   if (aDiagnostics) {
     // If libraries failed to load, the following loop over mCurrentPDMs
     // will not even try to use them. So we record failures now.
+    if (mWMFFailedToLoad) {
+      aDiagnostics->SetWMFFailedToLoad();
+    }
     if (mFFmpegFailedToLoad) {
       aDiagnostics->SetFFmpegFailedToLoad();
     }

diff --git a/dom/media/platforms/PDMFactory.h b/dom/media/platforms/PDMFactory.h
@@ -95,6 +95,7 @@ class PDMFactory final {
   nsTArray<RefPtr<PlatformDecoderModule>> mCurrentPDMs;
   RefPtr<PlatformDecoderModule> mEMEPDM;
 
+  bool mWMFFailedToLoad = false;
   bool mFFmpegFailedToLoad = false;
 };