bug 1138238 ensure mUseHwAccel is set appropriately when WMFVideoMFTManager::Init() is called after Shutdown() r=cpearce

--HG--
extra : rebase_source : 3e7603db676772e161d3743a63f21b16d98fe424
This commit is contained in:
Karl Tomlinson 2015-02-26 14:24:33 +13:00
parent 19c1032182
commit 49b9f7e466

View File

@ -77,7 +77,7 @@ WMFVideoMFTManager::WMFVideoMFTManager(
, mImageContainer(aImageContainer)
, mDXVAEnabled(aDXVAEnabled)
, mLayersBackend(aLayersBackend)
, mUseHwAccel(false)
// mUseHwAccel is initialized in Init()
{
NS_ASSERTION(!NS_IsMainThread(), "Should not be on main thread.");
MOZ_ASSERT(mImageContainer);
@ -170,6 +170,7 @@ WMFVideoMFTManager::InitializeDXVA()
TemporaryRef<MFTDecoder>
WMFVideoMFTManager::Init()
{
mUseHwAccel = false; // default value; changed if D3D setup succeeds.
bool useDxva = InitializeDXVA();
RefPtr<MFTDecoder> decoder(new MFTDecoder());
@ -504,7 +505,7 @@ WMFVideoMFTManager::Shutdown()
bool
WMFVideoMFTManager::IsHardwareAccelerated() const
{
return mUseHwAccel;
return mDecoder && mUseHwAccel;
}
} // namespace mozilla