Bug 1156131 - Expand list of WMF DLLs that are whitelisted for use by EME plugins. r=bobowen
authorChris Pearce <cpearce@mozilla.com>
Mon, 20 Apr 2015 20:10:40 +1200
changeset 239978 9c9759bb9ae853f08285f840347ed83c1d3b82d9
parent 239977 d9cee33500ba810e1df1ad5b9d7fa7f5db40b262
child 239979 dff88d946047a32ce56f3f146485f0cb0c43c068
push id28618
push userkwierso@gmail.com
push dateMon, 20 Apr 2015 23:44:35 +0000
treeherdermozilla-central@bfbb2f3babcb [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbobowen
bugs1156131
milestone40.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1156131 - Expand list of WMF DLLs that are whitelisted for use by EME plugins. r=bobowen
dom/media/gmp/GMPChild.cpp
--- a/dom/media/gmp/GMPChild.cpp
+++ b/dom/media/gmp/GMPChild.cpp
@@ -305,16 +305,20 @@ GMPChild::GetAPI(const char* aAPIName, v
 bool
 GMPChild::PreLoadLibraries(const std::string& aPluginPath)
 {
   // This must be in sorted order and lowercase!
   static const char* whitelist[] =
     {
        "d3d9.dll", // Create an `IDirect3D9` to get adapter information
        "dxva2.dll", // Get monitor information
+       "evr.dll", // MFGetStrideForBitmapInfoHeader
+       "mfh264dec.dll", // H.264 decoder (on Windows Vista)
+       "mfheaacdec.dll", // AAC decoder (on Windows Vista)
+       "mfplat.dll", // MFCreateSample, MFCreateAlignedMemoryBuffer, MFCreateMediaType
        "msauddecmft.dll", // AAC decoder (on Windows 8)
        "msmpeg2adec.dll", // AAC decoder (on Windows 7)
        "msmpeg2vdec.dll", // H.264 decoder
     };
   static const int whitelistLen = sizeof(whitelist) / sizeof(whitelist[0]);
 
   nsCOMPtr<nsIFile> infoFile;
   GetInfoFile(aPluginPath, infoFile);