Bug 1253395 - Disable msmpeg2vdec.dll blackslisting - r=cpearce
authorGerald Squelart <gsquelart@mozilla.com>
Tue, 08 Mar 2016 12:54:48 +1100
changeset 338029 a715499846d42dd710272c342ff093ba861a957a
parent 338028 c6056b9dc732791a8a5a098faa6160fed165b151
child 338030 5bcb60614d0149f744ead7dfc351f37358b5960b
push id12405
push usercku@mozilla.com
push dateTue, 08 Mar 2016 03:35:29 +0000
reviewerscpearce
bugs1253395, 1242343
milestone47.0a1
Bug 1253395 - Disable msmpeg2vdec.dll blackslisting - r=cpearce Disable the blacklisting introduced in bug 1242343, as it was having a negative effect on many working configurations.
dom/media/platforms/wmf/WMFDecoderModule.cpp
--- a/dom/media/platforms/wmf/WMFDecoderModule.cpp
+++ b/dom/media/platforms/wmf/WMFDecoderModule.cpp
@@ -162,17 +162,17 @@ CanCreateWMFDecoder()
     result.emplace(CanCreateMFTDecoder(aGuid));
   }
   return result.value();
 }
 
 static bool
 IsH264DecoderBlacklisted()
 {
-#ifdef _WIN64
+#ifdef BLACKLIST_CRASHY_H264_DECODERS
   WCHAR systemPath[MAX_PATH + 1];
   if (!ConstructSystem32Path(L"msmpeg2vdec.dll", systemPath, MAX_PATH + 1)) {
     // Cannot build path -> Assume it's not the blacklisted DLL.
     return false;
   }
 
   DWORD zero;
   DWORD infoSize = GetFileVersionInfoSizeW(systemPath, &zero);
@@ -188,17 +188,17 @@ IsH264DecoderBlacklisted()
   {
     if ((vInfo->dwFileVersionMS == ((12u << 16) | 0u))
         && ((vInfo->dwFileVersionLS == ((9200u << 16) | 16426u))
             || (vInfo->dwFileVersionLS == ((9200u << 16) | 17037u)))) {
       // 12.0.9200.16426 & .17037 are blacklisted on Win64, see bug 1242343.
       return true;
     }
   }
-#endif // _WIN64
+#endif // BLACKLIST_CRASHY_H264_DECODERS
   return false;
 }
 
 /* static */ bool
 WMFDecoderModule::HasH264()
 {
   if (IsH264DecoderBlacklisted()) {
     return false;