diff options
| author | owenlin@chromium.org <owenlin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-09 03:47:18 +0000 |
|---|---|---|
| committer | owenlin@chromium.org <owenlin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-09 03:47:18 +0000 |
| commit | 32081bafa777c51645b3a5ac2ef6ab7d5445fd98 (patch) | |
| tree | d9366f252981525361938366d5e6870a896d4cf8 /content/common | |
| parent | 40d90a26206830cc851c030f0357e0c6b6e08f3a (diff) | |
| download | chromium_src-32081bafa777c51645b3a5ac2ef6ab7d5445fd98.zip chromium_src-32081bafa777c51645b3a5ac2ef6ab7d5445fd98.tar.gz chromium_src-32081bafa777c51645b3a5ac2ef6ab7d5445fd98.tar.bz2 | |
Remove the usage of omax-vda from the video_decode_accelerator_unittest.
Also remove the flag "use-exynos-vda" from the test since
it is not needed anymore.
BUG=223823
Review URL: https://chromiumcodereview.appspot.com/12844012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@192996 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/common')
| -rw-r--r-- | content/common/gpu/media/video_decode_accelerator_unittest.cc | 28 |
1 files changed, 6 insertions, 22 deletions
diff --git a/content/common/gpu/media/video_decode_accelerator_unittest.cc b/content/common/gpu/media/video_decode_accelerator_unittest.cc index 6b01a9a..10446be 100644 --- a/content/common/gpu/media/video_decode_accelerator_unittest.cc +++ b/content/common/gpu/media/video_decode_accelerator_unittest.cc @@ -49,7 +49,6 @@ #elif defined(OS_CHROMEOS) #if 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(ARCH_CPU_X86_FAMILY) #include "content/common/gpu/media/vaapi_video_decode_accelerator.h" #endif // ARCH_CPU_ARMEL @@ -376,19 +375,11 @@ void GLRenderingVDAClient::CreateDecoder() { static_cast<CGLContextObj>(rendering_helper_->GetGLContext()), this)); #elif defined(OS_CHROMEOS) #if defined(ARCH_CPU_ARMEL) - if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kUseExynosVda)) { - decoder_.reset( - new ExynosVideoDecodeAccelerator( - static_cast<EGLDisplay>(rendering_helper_->GetGLDisplay()), - static_cast<EGLContext>(rendering_helper_->GetGLContext()), - 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))); - } + decoder_.reset( + new ExynosVideoDecodeAccelerator( + 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()), @@ -974,10 +965,6 @@ int main(int argc, char **argv) { } if (it->first == "v" || it->first == "vmodule") continue; -#if defined(OS_CHROMEOS) && defined(ARCH_CPU_ARMEL) - if (it->first == switches::kUseExynosVda) - continue; -#endif LOG(FATAL) << "Unexpected switch: " << it->first << ":" << it->second; } @@ -988,10 +975,7 @@ int main(int argc, char **argv) { content::DXVAVideoDecodeAccelerator::PreSandboxInitialization(); #elif defined(OS_CHROMEOS) #if defined(ARCH_CPU_ARMEL) - if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kUseExynosVda)) - content::ExynosVideoDecodeAccelerator::PreSandboxInitialization(); - else - content::OmxVideoDecodeAccelerator::PreSandboxInitialization(); + content::ExynosVideoDecodeAccelerator::PreSandboxInitialization(); #elif defined(ARCH_CPU_X86_FAMILY) content::VaapiVideoDecodeAccelerator::PreSandboxInitialization(); #endif // ARCH_CPU_ARMEL |