From 544909dd55f1caff9d8037f69d9eb35130b5908a Mon Sep 17 00:00:00 2001 From: Sebastian Hengst Date: Thu, 7 Sep 2017 14:51:01 +0200 Subject: [PATCH] Backed out changeset acf2ccf34d75 (bug 1392143) --- dom/media/platforms/wmf/WMFVideoMFTManager.cpp | 10 +--------- toolkit/components/gfx/SanityTest.js | 2 -- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/dom/media/platforms/wmf/WMFVideoMFTManager.cpp b/dom/media/platforms/wmf/WMFVideoMFTManager.cpp index a8c4b43ae213..52156f5aef03 100644 --- a/dom/media/platforms/wmf/WMFVideoMFTManager.cpp +++ b/dom/media/platforms/wmf/WMFVideoMFTManager.cpp @@ -603,16 +603,8 @@ WMFVideoMFTManager::Init() bool WMFVideoMFTManager::InitInternal() { - // The H264 SanityTest uses a 132x132 videos to determine if DXVA can be used. - // so we want to use the software decoder for videos with lower resolutions. - static const int MIN_H264_HW_WIDTH = 132; - static const int MIN_H264_HW_HEIGHT = 132; - mUseHwAccel = false; // default value; changed if D3D setup succeeds. - bool useDxva = (mStreamType != H264 || - (mVideoInfo.ImageRect().width > MIN_H264_HW_WIDTH && - mVideoInfo.ImageRect().height > MIN_H264_HW_HEIGHT)) && - InitializeDXVA(); + bool useDxva = InitializeDXVA(); RefPtr decoder; diff --git a/toolkit/components/gfx/SanityTest.js b/toolkit/components/gfx/SanityTest.js index c69a4119db8f..9eae6c40b875 100644 --- a/toolkit/components/gfx/SanityTest.js +++ b/toolkit/components/gfx/SanityTest.js @@ -106,8 +106,6 @@ function takeWindowSnapshot(win, ctx) { // different colours. The top left of the video is 8,72 // and we test a pixel 33,33 into each quadrant to avoid // blending differences at the edges. -// If those values are ever changed, make sure to update -// WMFVideoMFTManager::CanUseDXVA accordingly. // // We allow massive amounts of fuzz for the colours since // it can depend hugely on the yuv -> rgb conversion, and