Index: content/common/gpu/media/video_decode_accelerator_unittest.cc |
diff --git a/content/common/gpu/media/video_decode_accelerator_unittest.cc b/content/common/gpu/media/video_decode_accelerator_unittest.cc |
index 265cc4f08371d464e609f9bd9035d91c9829e97d..a6344f306d43143109dcd1832b64660e324b6591 100644 |
--- a/content/common/gpu/media/video_decode_accelerator_unittest.cc |
+++ b/content/common/gpu/media/video_decode_accelerator_unittest.cc |
@@ -49,6 +49,7 @@ |
#include "content/common/gpu/media/vaapi_video_decode_accelerator.h" |
#elif 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.
|
#else |
#error The VideoAccelerator tests are not supported on this platform. |
#endif // defined(OS_WIN) |
@@ -324,12 +325,18 @@ void GLRenderingVDAClient::CreateDecoder() { |
decoder_.reset(new MacVideoDecodeAccelerator( |
static_cast<CGLContextObj>(rendering_helper_->GetGLContext()), this)); |
#elif defined(ARCH_CPU_ARMEL) |
- decoder_.reset( |
- new OmxVideoDecodeAccelerator( |
- static_cast<EGLDisplay>(rendering_helper_->GetGLDisplay()), |
- static_cast<EGLContext>(rendering_helper_->GetGLContext()), |
- this, |
- base::Bind(&DoNothingReturnTrue))); |
+ if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kUseExynosVda)) |
+ decoder_.reset( |
+ new ExynosVideoDecodeAccelerator( |
+ rendering_helper_->GetGLDisplay(), this, |
+ base::Bind(&DoNothingReturnTrue))); |
+ else |
+ decoder_.reset( |
+ new OmxVideoDecodeAccelerator( |
+ static_cast<EGLDisplay>(rendering_helper_->GetGLDisplay()), |
+ static_cast<EGLContext>(rendering_helper_->GetGLContext()), |
+ this, |
+ base::Bind(&DoNothingReturnTrue))); |
#elif defined(ARCH_CPU_X86_FAMILY) |
decoder_.reset(new VaapiVideoDecodeAccelerator( |
static_cast<Display*>(rendering_helper_->GetGLDisplay()), |
@@ -892,7 +899,10 @@ int main(int argc, char **argv) { |
#if defined(OS_WIN) |
content::DXVAVideoDecodeAccelerator::PreSandboxInitialization(); |
#elif defined(OS_CHROMEOS) && defined(ARCH_CPU_ARMEL) |
- content::OmxVideoDecodeAccelerator::PreSandboxInitialization(); |
+ if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kUseExynosVda)) |
+ content::ExynosVideoDecodeAccelerator::PreSandboxInitialization(); |
+ else |
+ content::OmxVideoDecodeAccelerator::PreSandboxInitialization(); |
#elif defined(OS_CHROMEOS) && defined(ARCH_CPU_X86_FAMILY) |
content::VaapiVideoDecodeAccelerator::PreSandboxInitialization(); |
#endif |