Skip to content

Commit

Permalink
Delete dead code: OmxVideoDecodeAccelerator is unused.
Browse files Browse the repository at this point in the history
OVDA has been dead code in the tree since 3/13 and m27
https://gerrit.chromium.org/gerrit/gitweb?p=chromiumos/platform/login_manager.git;a=commit;h=934e55cd90c2fd7a5b89fe201b251d542e896f46

BUG=223194
NOTRY=true

Review URL: https://chromiumcodereview.appspot.com/21584002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@215933 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
fischman@chromium.org committed Aug 6, 2013
1 parent 6dc1793 commit 3943be2
Show file tree
Hide file tree
Showing 31 changed files with 7 additions and 8,534 deletions.
1 change: 0 additions & 1 deletion chrome/browser/chromeos/login/chrome_restart_request.cc
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,6 @@ std::string DeriveCommandLine(const GURL& start_url,
#endif
::switches::kUseGL,
::switches::kUserDataDir,
::switches::kUseExynosVda,
::switches::kV,
::switches::kEnableWebGLDraftExtensions,
ash::switches::kAshDefaultGuestWallpaperLarge,
Expand Down
1 change: 0 additions & 1 deletion content/browser/gpu/gpu_process_host.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1156,7 +1156,6 @@ bool GpuProcessHost::LaunchGpuProcess(const std::string& channel_id) {
switches::kReduceGpuSandbox,
switches::kTestGLLib,
switches::kTraceStartup,
switches::kUseExynosVda,
switches::kV,
switches::kVModule,
#if defined(OS_MACOSX)
Expand Down
1 change: 0 additions & 1 deletion content/common/gpu/DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ include_rules = [
"+libGLESv2",
"+media/video/video_decode_accelerator.h",
"+skia",
"+third_party/openmax",
"+third_party/mesa",

# For single process mode
Expand Down
91 changes: 0 additions & 91 deletions content/common/gpu/media/gles2_texture_to_egl_image_translator.cc

This file was deleted.

42 changes: 0 additions & 42 deletions content/common/gpu/media/gles2_texture_to_egl_image_translator.h

This file was deleted.

19 changes: 5 additions & 14 deletions content/common/gpu/media/gpu_video_decode_accelerator.cc
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
#include "content/common/gpu/media/dxva_video_decode_accelerator.h"
#elif defined(OS_CHROMEOS) && defined(ARCH_CPU_ARMEL) && defined(USE_X11)
#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) && defined(USE_X11)
#include "ui/gl/gl_context_glx.h"
#include "content/common/gpu/media/vaapi_video_decode_accelerator.h"
Expand Down Expand Up @@ -176,19 +175,11 @@ void GpuVideoDecodeAccelerator::Initialize(
video_decode_accelerator_.reset(new DXVAVideoDecodeAccelerator(
this, make_context_current_));
#elif defined(OS_CHROMEOS) && defined(ARCH_CPU_ARMEL) && defined(USE_X11)
if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kUseExynosVda)) {
video_decode_accelerator_.reset(new ExynosVideoDecodeAccelerator(
gfx::GLSurfaceEGL::GetHardwareDisplay(),
stub_->decoder()->GetGLContext()->GetHandle(),
this,
make_context_current_));
} else {
video_decode_accelerator_.reset(new OmxVideoDecodeAccelerator(
gfx::GLSurfaceEGL::GetHardwareDisplay(),
stub_->decoder()->GetGLContext()->GetHandle(),
this,
make_context_current_));
}
video_decode_accelerator_.reset(new ExynosVideoDecodeAccelerator(
gfx::GLSurfaceEGL::GetHardwareDisplay(),
stub_->decoder()->GetGLContext()->GetHandle(),
this,
make_context_current_));
#elif defined(OS_CHROMEOS) && defined(ARCH_CPU_X86_FAMILY) && defined(USE_X11)
gfx::GLContextGLX* glx_context =
static_cast<gfx::GLContextGLX*>(stub_->decoder()->GetGLContext());
Expand Down
Loading

0 comments on commit 3943be2

Please sign in to comment.