content/common/gpu/media/video_encode_accelerator_unittest.cc - Issue 490233002: VaapiVideoAccelerator: make Vaapi accelerator work with ozone

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/video_encode_accelerator_unittest.cc

Issue 490233002: VaapiVideoAccelerator: make Vaapi accelerator work with ozone (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Update test field Created 6 years, 4 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

« content/common/gpu/media/gpu_video_decode_accelerator.cc ('K') | « content/common/gpu/media/video_decode_accelerator_unittest.cc ('k') | content/common/sandbox_linux/bpf_gpu_policy_linux.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 9d1e3b69dc7c9edccf56b2fab6021bc0fb20f23b..78c6450c17966193948008f2b91cf27aaf6bcb54 100644

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

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

@@ -21,10 +21,6 @@

#include "media/video/video_encode_accelerator.h"

#include "testing/gtest/include/gtest/gtest.h"

-#if defined(USE_X11)

-#include "ui/gfx/x/x11_types.h"

-#endif

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

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

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

@@ -587,8 +583,8 @@ void VEAClient::CreateEncoder() {

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

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

encoder_.reset(new V4L2VideoEncodeAccelerator(device.Pass()));

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

- encoder_.reset(new VaapiVideoEncodeAccelerator(gfx::GetXDisplay()));

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

+ encoder_.reset(new VaapiVideoEncodeAccelerator());

#endif

SetState(CS_ENCODER_SET);