content/gpu/gpu_main.cc - Issue 11198060: VDA implementation for Exynos, using V4L2

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/gpu/gpu_main.cc

Issue 11198060: VDA implementation for Exynos, using V4L2 (Closed) Base URL: https://git.chromium.org/git/chromium/src@git-svn

Patch Set: Reuploading so I can resbumit because the Windows builders were broken due to a WebKit roll, and I … Created 7 years, 11 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:

Index: content/gpu/gpu_main.cc

diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc

index 3020600ed34dc1785fc90d6a5dddc52e94b0651d..ffb90fea84132f37fddcf90df90264c92f463967 100644

--- a/content/gpu/gpu_main.cc

+++ b/content/gpu/gpu_main.cc

@@ -35,6 +35,7 @@

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

#include "sandbox/win/src/sandbox.h"

#elif defined(OS_CHROMEOS) && 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(OS_CHROMEOS) && defined(ARCH_CPU_X86_FAMILY)

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

@@ -338,7 +339,10 @@ void WarmUpSandbox(const GPUInfo& gpu_info,

}

#if defined(OS_CHROMEOS) && defined(ARCH_CPU_ARMEL)

- OmxVideoDecodeAccelerator::PreSandboxInitialization();

+ if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kUseExynosVda))

+ ExynosVideoDecodeAccelerator::PreSandboxInitialization();

+ else

+ OmxVideoDecodeAccelerator::PreSandboxInitialization();

#elif defined(OS_CHROMEOS) && defined(ARCH_CPU_X86_FAMILY)

VaapiVideoDecodeAccelerator::PreSandboxInitialization();

#endif

« no previous file with comments | « content/content_common.gypi ('k') | content/public/common/content_switches.h » ('j') | no next file with comments »