diff options
| author | fischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-04 08:38:10 +0000 |
|---|---|---|
| committer | fischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-04 08:38:10 +0000 |
| commit | d254e7e05b9e0b54c0e04eaa6c4a8b1bc2ca7310 (patch) | |
| tree | c3666d45898abc4eaed64541ceceb2e12a243cde /content/gpu | |
| parent | 150f5ecaae1990831fe472cbc66b2f2d61901b7f (diff) | |
| download | chromium_src-d254e7e05b9e0b54c0e04eaa6c4a8b1bc2ca7310.zip chromium_src-d254e7e05b9e0b54c0e04eaa6c4a8b1bc2ca7310.tar.gz chromium_src-d254e7e05b9e0b54c0e04eaa6c4a8b1bc2ca7310.tar.bz2 | |
Only dlopen() OMX/VAAPI libs in the GPU process, and only lazily dlsym() their symbols.
This reinstates r150007, which was reverted in r150009.
TBR=piman@chromium.org
BUG=140412
Review URL: https://chromiumcodereview.appspot.com/10827173
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150024 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/gpu')
| -rw-r--r-- | content/gpu/gpu_main.cc | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc index 75ab303..be58304 100644 --- a/content/gpu/gpu_main.cc +++ b/content/gpu/gpu_main.cc @@ -30,6 +30,10 @@ #if defined(OS_WIN) #include "content/common/gpu/media/dxva_video_decode_accelerator.h" #include "sandbox/win/src/sandbox.h" +#elif defined(OS_CHROMEOS) && defined(ARCH_CPU_ARMEL) +#include "content/common/gpu/media/omx_video_decode_accelerator.h" +#elif defined(OS_CHROMEOS) && defined(ARCH_CPU_X86_FAMILY) +#include "content/common/gpu/media/vaapi_video_decode_accelerator.h" #endif #if defined(USE_X11) @@ -149,6 +153,12 @@ int GpuMain(const content::MainFunctionParams& parameters) { TRACE_EVENT0("gpu", "Initialize sandbox"); bool do_init_sandbox = true; +#if defined(OS_CHROMEOS) && defined(ARCH_CPU_ARMEL) + OmxVideoDecodeAccelerator::PreSandboxInitialization(); +#elif defined(OS_CHROMEOS) && defined(ARCH_CPU_X86_FAMILY) + VaapiVideoDecodeAccelerator::PreSandboxInitialization(); +#endif + #if defined(OS_CHROMEOS) && defined(NDEBUG) // On Chrome OS and when not on a debug build, initialize // the GPU process' sandbox only for Intel GPUs. |