Index: content/gpu/gpu_main.cc |
diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc |
index 0e84d3e431adab223afaac11b7f254fa56d706b9..1b3ca69edf637bc581629a6b6752dabf1b387f18 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" |
@@ -308,7 +309,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 |