content/common/gpu/media/gpu_video_decode_accelerator.cc - Issue 14401013: Delete MacVDA from the codebase since it is dead code and not being worked on.

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 14401013: Delete MacVDA from the codebase since it is dead code and not being worked on. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Remove pointless flag from linux & mac Created 7 years, 8 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/avc_config_record_builder_unittest.cc ('k') | content/common/gpu/media/mac_video_decode_accelerator.h » ('j') | no next file with comments »
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 1bce036849ca982d8645e03b061f0090453c90e1..82be8bb576da6ca2b9fa8ddc5db813fa021e58b2 100644

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

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

@@ -29,9 +29,6 @@

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

-#elif defined(OS_MACOSX)

-#include "gpu/command_buffer/service/texture_manager.h"

-#include "content/common/gpu/media/mac_video_decode_accelerator.h"

#elif defined(OS_ANDROID)

#include "content/common/gpu/media/android_video_decode_accelerator.h"

#endif

@@ -205,11 +202,6 @@ void GpuVideoDecodeAccelerator::Initialize(

video_decode_accelerator_.reset(new VaapiVideoDecodeAccelerator(

glx_context->display(), glx_context_handle, this,

make_context_current_));

-#elif defined(OS_MACOSX)

- video_decode_accelerator_.reset(new MacVideoDecodeAccelerator(

- static_cast<CGLContextObj>(

- stub_->decoder()->GetGLContext()->GetHandle()),

- this));

#elif defined(OS_ANDROID)

video_decode_accelerator_.reset(new AndroidVideoDecodeAccelerator(

this,