content/common/gpu/media/gpu_video_decode_accelerator.cc - Issue 21584002: Delete dead code: OmxVideoDecodeAccelerator is unused.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/common/gpu/media/gpu_video_decode_accelerator.cc

Issue 21584002: Delete dead code: OmxVideoDecodeAccelerator is unused. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/common/gpu/media/gles2_texture_to_egl_image_translator.cc ('k') | content/common/gpu/media/omx_video_decode_accelerator.h » ('j') | content/public/common/content_switches.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/common/gpu/media/gpu_video_decode_accelerator.cc

diff --git a/content/common/gpu/media/gpu_video_decode_accelerator.cc b/content/common/gpu/media/gpu_video_decode_accelerator.cc

index f3bc4b8eb86bb3634dd80b94e9603713877a8a24..2b0bb848b69fba9b2acf8d68839441932af28917 100644

--- a/content/common/gpu/media/gpu_video_decode_accelerator.cc

+++ b/content/common/gpu/media/gpu_video_decode_accelerator.cc

@@ -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"

@@ -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());