Backed out changeset acf2ccf34d75 (bug 1392143)

This commit is contained in:
Sebastian Hengst 2017-09-07 14:51:01 +02:00
Родитель 26b877fa75
Коммит 544909dd55
2 изменённых файлов: 1 добавлений и 11 удалений

Просмотреть файл

@ -603,16 +603,8 @@ WMFVideoMFTManager::Init()
bool bool
WMFVideoMFTManager::InitInternal() 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. mUseHwAccel = false; // default value; changed if D3D setup succeeds.
bool useDxva = (mStreamType != H264 || bool useDxva = InitializeDXVA();
(mVideoInfo.ImageRect().width > MIN_H264_HW_WIDTH &&
mVideoInfo.ImageRect().height > MIN_H264_HW_HEIGHT)) &&
InitializeDXVA();
RefPtr<MFTDecoder> decoder; RefPtr<MFTDecoder> decoder;

Просмотреть файл

@ -106,8 +106,6 @@ function takeWindowSnapshot(win, ctx) {
// different colours. The top left of the video is 8,72 // different colours. The top left of the video is 8,72
// and we test a pixel 33,33 into each quadrant to avoid // and we test a pixel 33,33 into each quadrant to avoid
// blending differences at the edges. // 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 // We allow massive amounts of fuzz for the colours since
// it can depend hugely on the yuv -> rgb conversion, and // it can depend hugely on the yuv -> rgb conversion, and