Backed out changeset acf2ccf34d75 (bug 1392143)
authorSebastian Hengst <archaeopteryx@coole-files.de>
Thu, 07 Sep 2017 14:51:01 +0200
changeset 428941 72788198fef321fb56556a9f2c0c5072c68fe01a
parent 428940 5c74e0d9dffc47a63c7ac2f618e4a01eb4961915
child 428942 3c5539322b579b27c178fde7af6c3f20c42224ec
push id7761
push userjlund@mozilla.com
push dateFri, 15 Sep 2017 00:19:52 +0000
treeherdermozilla-beta@c38455951db4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1392143
milestone57.0a1
backs outacf2ccf34d753305b27487c55ca80ad37b61136a
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
Backed out changeset acf2ccf34d75 (bug 1392143)
dom/media/platforms/wmf/WMFVideoMFTManager.cpp
toolkit/components/gfx/SanityTest.js
--- a/dom/media/platforms/wmf/WMFVideoMFTManager.cpp
+++ b/dom/media/platforms/wmf/WMFVideoMFTManager.cpp
@@ -598,26 +598,18 @@ WMFVideoMFTManager::Init()
   }
 
   return success;
 }
 
 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<MFTDecoder> decoder;
 
   HRESULT hr;
   if (mStreamType == VP9 && useDxva && mCheckForAMDDecoder &&
       gfxPrefs::PDMWMFAMDVP9DecoderEnabled()) {
     if ((decoder = LoadAMDVP9Decoder())) {
       mAMDVP9InUse = true;
--- a/toolkit/components/gfx/SanityTest.js
+++ b/toolkit/components/gfx/SanityTest.js
@@ -101,18 +101,16 @@ function takeWindowSnapshot(win, ctx) {
 // Verify that all the 4 coloured squares of the video
 // render as expected (with a tolerance of 64 to allow for
 // yuv->rgb differences between platforms).
 //
 // The video is 132*132, and is split into quadrants of
 // 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
 // we don't want to fail unnecessarily.
 function verifyVideoRendering(ctx) {
   return testPixel(ctx, 41, 105, 255, 255, 255, 255, 64) &&
     testPixel(ctx, 107, 105, 0, 255, 0, 255, 64) &&
     testPixel(ctx, 41, 171, 0, 0, 255, 255, 64) &&