content/common/gpu/media/gpu_video_decode_accelerator_factory_impl.cc - Issue 1872393002: Enable VAAPI accelerated decode on Linux

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

Issue 1872393002: Enable VAAPI accelerated decode on Linux Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Add missing JPEG change Created 4 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/gpu_video_decode_accelerator_factory_impl.h ('k') | content/common/gpu/media/jpeg_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_decode_accelerator_factory_impl.cc

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

index f6ec448a1229553744e0cbc3f22b3ca46c56c8ab..33a31f19e8aa326d78286c0d551cee66c3d39efa 100644

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

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

@@ -14,7 +14,7 @@

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

#elif defined(OS_MACOSX)

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

-#elif defined(OS_CHROMEOS)

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

#if defined(USE_V4L2_CODEC)

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

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

@@ -79,7 +79,7 @@ GpuVideoDecodeAcceleratorFactoryImpl::GetDecoderCapabilities(

#if defined(OS_WIN)

capabilities.supported_profiles =

DXVAVideoDecodeAccelerator::GetSupportedProfiles();

-#elif defined(OS_CHROMEOS)

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

media::VideoDecodeAccelerator::SupportedProfiles vda_profiles;

#if defined(USE_V4L2_CODEC)

vda_profiles = V4L2VideoDecodeAccelerator::GetSupportedProfiles();

@@ -130,7 +130,7 @@ GpuVideoDecodeAcceleratorFactoryImpl::CreateVDA(

&GpuVideoDecodeAcceleratorFactoryImpl::CreateV4L2VDA,

&GpuVideoDecodeAcceleratorFactoryImpl::CreateV4L2SVDA,

#endif

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

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

&GpuVideoDecodeAcceleratorFactoryImpl::CreateVaapiVDA,

#endif

#if defined(OS_MACOSX)

@@ -195,7 +195,7 @@ GpuVideoDecodeAcceleratorFactoryImpl::CreateV4L2SVDA(

}

#endif

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

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

std::unique_ptr<media::VideoDecodeAccelerator>

GpuVideoDecodeAcceleratorFactoryImpl::CreateVaapiVDA(

const gpu::GpuPreferences& gpu_preferences) const {