content/common/gpu/media/gpu_video_encode_accelerator.cc - Issue 902773003: Revert of Clean up V4L2 codec-related flags and defines

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_encode_accelerator.cc

Issue 902773003: Revert of Clean up V4L2 codec-related flags and defines (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 10 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/gpu_video_decode_accelerator.cc ('k') | content/common/gpu/media/video_decode_accelerator_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index a2c3365cf790b6da99ba1d1091b0a9f2a2a21fad..df16d97839ac9b14e8a407ce06d25622df1e873b 100644

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

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

@@ -18,12 +18,13 @@

#include "media/base/video_frame.h"

#if defined(OS_CHROMEOS)

-#if defined(USE_V4L2_CODEC)

+#if defined(ARCH_CPU_ARMEL) || (defined(USE_OZONE) && defined(USE_V4L2_CODEC))

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

+// defined(ARCH_CPU_ARMEL) || (defined(USE_OZONE) && defined(USE_V4L2_CODEC))

#endif

#if defined(ARCH_CPU_X86_FAMILY)

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

-#endif

+#endif // defined(ARCH_CPU_X86_FAMILY)

#elif defined(OS_ANDROID) && defined(ENABLE_WEBRTC)

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

#endif

@@ -211,7 +212,8 @@

scoped_ptr<media::VideoEncodeAccelerator>

GpuVideoEncodeAccelerator::CreateV4L2VEA() {

scoped_ptr<media::VideoEncodeAccelerator> encoder;

-#if defined(OS_CHROMEOS) && defined(USE_V4L2_CODEC)

+#if defined(OS_CHROMEOS) && (defined(ARCH_CPU_ARMEL) || \

+ (defined(USE_OZONE) && defined(USE_V4L2_CODEC)))

scoped_refptr<V4L2Device> device = V4L2Device::Create(V4L2Device::kEncoder);

if (device)

encoder.reset(new V4L2VideoEncodeAccelerator(device));