content/common/gpu/media/video_decode_accelerator_unittest.cc - Issue 16430003: Remove linux x86 from HW video decode black list

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

Issue 16430003: Remove linux x86 from HW video decode black list Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase to r263658 Created 6 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:

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

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

index 01d88781d2d24e85162e1257053cb3d4a29f4654..6c17499c24dfb7d8818476035941242d268c42a1 100644

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

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

@@ -57,7 +57,7 @@

#elif defined(OS_CHROMEOS) && defined(ARCH_CPU_ARMEL)

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

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

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

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

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

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

#if defined(USE_X11)

@@ -565,7 +565,7 @@ void GLRenderingVDAClient::CreateAndStartDecoder() {

base::Bind(&DoNothingReturnTrue),

device.Pass(),

base::MessageLoopProxy::current()));

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

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

CHECK_EQ(gfx::kGLImplementationDesktopGL, gfx::GetGLImplementation())

<< "Hardware video decode does not work with OSMesa";

decoder_.reset(new VaapiVideoDecodeAccelerator(