Do DXVA pre-sandbox initialization off the main thread.

content/gpu/gpu_main.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stdlib.h>
 
 #if defined(OS_WIN)
 #include <windows.h>
 #endif
 
@@ skipping 150 matching lines @@
   success = base::HexStringToInt(
       command_line.GetSwitchValueASCII(switches::kGpuDeviceID),
       reinterpret_cast<int*>(&(gpu_info.gpu.device_id)));
   DCHECK(success);
   gpu_info.driver_vendor =
       command_line.GetSwitchValueASCII(switches::kGpuDriverVendor);
   gpu_info.driver_version =
       command_line.GetSwitchValueASCII(switches::kGpuDriverVersion);
   GetContentClient()->SetGpuInfo(gpu_info);
 
+#if defined(OS_WIN)
+  // Asynchronously initialize DXVA while GL is being initialized because
+  // they both take tens of ms.
+  base::WaitableEvent dxva_initialized(true, false);
+  DXVAVideoDecodeAccelerator::PreSandboxInitialization(
+      base::Bind(&base::WaitableEvent::Signal,
+                 base::Unretained(&dxva_initialized)));
+#endif
+
   // We need to track that information for the WarmUpSandbox function.
   bool initialized_gl_context = false;
   // Load and initialize the GL implementation and locate the GL entry points.
   if (gfx::GLSurface::InitializeOneOff()) {
     if (!command_line.HasSwitch(switches::kSkipGpuFullInfoCollection)) {
       if (!gpu_info_collector::CollectGraphicsInfo(&gpu_info))
         VLOG(1) << "gpu_info_collector::CollectGraphicsInfo failed";
       GetContentClient()->SetGpuInfo(gpu_info);
 
       // We know that CollectGraphicsInfo will initialize a GLContext.
@@ skipping 55 matching lines @@
         watchdog_thread->Stop();
       gpu_info.sandboxed = InitializeSandbox();
       if (watchdog_thread.get())
         watchdog_thread->Start();
     }
   }
 #endif
 
 #if defined(OS_WIN)
   {
+    // DXVA initialization must have completed before the token is lowered.
+    TRACE_EVENT0("gpu", "Wait for DXVA initialization");
+    dxva_initialized.Wait();
+  }
+
+  {
     TRACE_EVENT0("gpu", "Lower token");
     // For windows, if the target_services interface is not zero, the process
     // is sandboxed and we must call LowerToken() before rendering untrusted
     // content.
     sandbox::TargetServices* target_services =
         parameters.sandbox_info->target_services;
     if (target_services) {
       target_services->LowerToken();
       gpu_info.sandboxed = true;
     }
@@ skipping 79 matching lines @@
   bool uses_nvidia_driver = (gpu_info.gpu.vendor_id == 0x10de &&  // NVIDIA.
                              gpu_info.driver_vendor == "NVIDIA") ||
                             gpu_info.optimus;
   if (uses_nvidia_driver && should_initialize_gl_context) {
     // We need this on Nvidia to pre-open /dev/nvidiactl and /dev/nvidia0.
     CreateDummyGlContext();
   }
 #endif
 
 #if defined(OS_WIN)
-  {
-    TRACE_EVENT0("gpu", "Initialize COM");
-    base::win::ScopedCOMInitializer com_initializer;

[apatrick_chromium, 2012/11/29 21:54:58]

This was clearly nonsense. COM would be uninitialized as soon as the variable
went out of scope.

-  }
-
-  {
-    TRACE_EVENT0("gpu", "Preload setupapi.dll");
-    // Preload this DLL because the sandbox prevents it from loading.
-    LoadLibrary(L"setupapi.dll");
-  }
-
-  {
-    TRACE_EVENT0("gpu", "Initialize DXVA");
-    // Initialize H/W video decoding stuff which fails in the sandbox.
-    DXVAVideoDecodeAccelerator::PreSandboxInitialization();
-  }
+  // Preload these DLL because the sandbox prevents them from loading.
+  LoadLibrary(L"setupapi.dll");
 #endif
 }
 
 }  // namespace.
 
 }  // namespace content