Index: content/gpu/gpu_main.cc |
diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc |
index 4fd27d6125586209a7cde8ec9e7e8220786d12de..28fc579ea2ed491cb69311942c148a820b6f0983 100644 |
--- a/content/gpu/gpu_main.cc |
+++ b/content/gpu/gpu_main.cc |
@@ -34,6 +34,7 @@ |
#include "sandbox/win/src/sandbox.h" |
#elif defined(OS_CHROMEOS) && defined(ARCH_CPU_ARMEL) |
#include "content/common/gpu/media/omx_video_decode_accelerator.h" |
+#include "content/common/gpu/media/exynos_video_decode_accelerator.h" |
Ami GONE FROM CHROMIUM
2012/10/31 01:06:50
above prev line
sheu
2012/11/01 02:16:08
Done.
|
#elif defined(OS_CHROMEOS) && defined(ARCH_CPU_X86_FAMILY) |
#include "content/common/gpu/media/vaapi_video_decode_accelerator.h" |
#endif |
@@ -271,7 +272,10 @@ void WarmUpSandbox(const GPUInfo& gpu_info, |
} |
#if defined(OS_CHROMEOS) && defined(ARCH_CPU_ARMEL) |
- OmxVideoDecodeAccelerator::PreSandboxInitialization(); |
+ if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kUseExynosVda)) |
+ ExynosVideoDecodeAccelerator::PreSandboxInitialization(); |
+ else |
+ OmxVideoDecodeAccelerator::PreSandboxInitialization(); |
#elif defined(OS_CHROMEOS) && defined(ARCH_CPU_X86_FAMILY) |
VaapiVideoDecodeAccelerator::PreSandboxInitialization(); |
#endif |