Index: content/gpu/gpu_main.cc |
diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc |
index 96473c06aff101f4a8bc09364c7a76cc0e33bcc1..786bd0c2f3603819f7f6abcd601590ef2acb10e7 100644 |
--- a/content/gpu/gpu_main.cc |
+++ b/content/gpu/gpu_main.cc |
@@ -35,6 +35,7 @@ |
#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/exynos_video_decode_accelerator.h" |
#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" |
@@ -325,7 +326,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 |