Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-14 18:51:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1313343 - media.wmf.skip-blacklist controls D3D blaclists - r=cpearce

Browse Source 
If pref "media.wmf.skip-blacklist" is true, disable D3D blacklisting based on
"media.wmf.disable-d3d9-for-dlls" and "media.wmf.disable-d3d11-for-dlls".

MozReview-Commit-ID: IothZlUnK7h

--HG--
extra : rebase_source : 1731b39808526fce70d84342a016bd25b6cd8571
This commit is contained in:
Gerald Squelart 2016-11-07 18:12:51 +11:00
parent bb3c565546
commit 6f36d2e8a8
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dom/media/MediaPrefs.h
View File

@ -122,6 +122,7 @@ private:
#endif
#ifdef XP_WIN
DECL_MEDIA_PREF("media.wmf.enabled", PDMWMFEnabled, bool, true);
DECL_MEDIA_PREF("media.wmf.skip-blacklist", PDMWMFSkipBlacklist, bool, false);
DECL_MEDIA_PREF("media.decoder-doctor.wmf-disabled-is-failure", DecoderDoctorWMFDisabledIsFailure, bool, false);
DECL_MEDIA_PREF("media.wmf.vp9.enabled", PDMWMFVP9DecoderEnabled, bool, true);
DECL_MEDIA_PREF("media.wmf.decoder.thread-count", PDMWMFThreadCount, int32_t, -1);

7
dom/media/platforms/wmf/WMFVideoMFTManager.cpp
View File

@ -18,6 +18,7 @@
#include "mozilla/ClearOnShutdown.h"
#include "mozilla/layers/LayersTypes.h"
#include "MediaInfo.h"
#include "MediaPrefs.h"
#include "mozilla/Logging.h"
#include "nsWindowsHelpers.h"
#include "gfx2DGlue.h"
@ -66,7 +67,7 @@ const CLSID CLSID_WebmMfVpxDec =
};
namespace mozilla {
LayersBackend
GetCompositorBackendType(layers::KnowsCompositor* aKnowsCompositor)
{
@ -180,8 +181,8 @@ FindDXVABlacklistedDLL(StaticAutoPtr<D3DDLLBlacklistingCache>& aDLLBlacklistingC
ClearOnShutdown(&aDLLBlacklistingCache);
}
if (aBlacklist.IsEmpty()) {
// Empty blacklist -> No blacklisting.
if (aBlacklist.IsEmpty() || MediaPrefs::PDMWMFSkipBlacklist()) {
// Empty blacklist, or "media.wmf.skip-blacklist"=true -> No blacklisting.
aDLLBlacklistingCache->mBlacklistPref.SetLength(0);
aDLLBlacklistingCache->mBlacklistedDLL.SetLength(0);
return aDLLBlacklistingCache->mBlacklistedDLL;