diff options
| author | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-21 22:34:47 +0000 |
|---|---|---|
| committer | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-21 22:34:47 +0000 |
| commit | fa0ed5e868bcff1b3f7f674cab8a20f754969a83 (patch) | |
| tree | abd5454fb85c5cc22a0557eb084bf566497f87c4 /content/gpu | |
| parent | f1e3fbe9e0648e47c8d73d1f17beca8a7bc30e44 (diff) | |
| download | chromium_src-fa0ed5e868bcff1b3f7f674cab8a20f754969a83.zip chromium_src-fa0ed5e868bcff1b3f7f674cab8a20f754969a83.tar.gz chromium_src-fa0ed5e868bcff1b3f7f674cab8a20f754969a83.tar.bz2 | |
Do DXVA init inside (lowered) gpu sandbox
On some drivers, the second D3D9 device creation stalls for long periods
of time. By deferring DXVA's until it's required, we can avoid the delay
at startup caused by DXVA + ANGLE both creating d3d devices at startup.
This is possible now, but wasn't before because of the lowering of the
gpu sandbox in http://crrev.com/233785 .
Also, some refactoring and cleanups since not needing pre-sandbox
initialization allows us to simplify a bit.
R=fischman@chromium.org, ananta@chromium.org
TBR=kbr@chromium.org
BUG=311259,270179
Review URL: https://codereview.chromium.org/79303003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@236612 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/gpu')
| -rw-r--r-- | content/gpu/gpu_main.cc | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc index 1aee08f..224c85af 100644 --- a/content/gpu/gpu_main.cc +++ b/content/gpu/gpu_main.cc @@ -40,7 +40,6 @@ #if defined(OS_WIN) #include "base/win/windows_version.h" #include "base/win/scoped_com_initializer.h" -#include "content/common/gpu/media/dxva_video_decode_accelerator.h" #include "sandbox/win/src/sandbox.h" #elif defined(OS_CHROMEOS) && defined(ARCH_CPU_ARMEL) && defined(USE_X11) #include "content/common/gpu/media/exynos_video_decode_accelerator.h" @@ -375,12 +374,6 @@ bool WarmUpSandbox(const CommandLine& command_line) { } } - if (!command_line.HasSwitch(switches::kDisableAcceleratedVideoDecode)) { - TRACE_EVENT0("gpu", "Initialize DXVA"); - // Initialize H/W video decoding stuff which fails in the sandbox. - DXVAVideoDecodeAccelerator::PreSandboxInitialization(); - } - { TRACE_EVENT0("gpu", "Warm up DWM"); |