content/content_common.gypi - Issue 1040513003: VAVDA: Use the new, generic video decoder and accelerator infrastructure.

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/content_common.gypi

Issue 1040513003: VAVDA: Use the new, generic video decoder and accelerator infrastructure. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix whitespace Created 5 years, 9 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/vaapi_video_encode_accelerator.cc ('K') | « content/common/gpu/media/vaapi_video_encode_accelerator.cc ('k') | tools/metrics/histograms/histograms.xml » ('j') | tools/metrics/histograms/histograms.xml » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/content_common.gypi

diff --git a/content/content_common.gypi b/content/content_common.gypi

index 9516f366db681e071e735ad26667d671f7c387ad..0f5910f980fb9aee7d739ada5324a1e3c10a49e5 100644

--- a/content/content_common.gypi

+++ b/content/content_common.gypi

@@ -816,6 +816,15 @@

}],

+ ['chromeos==1', {

+ 'sources': [

+ 'common/gpu/media/accelerated_video_decoder.h',

+ 'common/gpu/media/h264_decoder.cc',

+ 'common/gpu/media/h264_decoder.h',

+ 'common/gpu/media/h264_dpb.cc',

+ 'common/gpu/media/h264_dpb.h',

+ ],

+ }],

['chromeos==1 and use_v4l2_codec==1', {

'direct_dependent_settings': {

'defines': [

@@ -829,13 +838,8 @@

'../media/media.gyp:media',

'sources': [

- 'common/gpu/media/accelerated_video_decoder.h',

'common/gpu/media/generic_v4l2_device.cc',

'common/gpu/media/generic_v4l2_device.h',

- 'common/gpu/media/h264_decoder.cc',

- 'common/gpu/media/h264_decoder.h',

- 'common/gpu/media/h264_dpb.cc',

- 'common/gpu/media/h264_dpb.h',

'common/gpu/media/v4l2_device.cc',

'common/gpu/media/v4l2_device.h',

'common/gpu/media/v4l2_image_processor.cc',

@@ -868,10 +872,6 @@

'sources': [

'common/gpu/media/va_surface.h',

- 'common/gpu/media/vaapi_h264_decoder.cc',

- 'common/gpu/media/vaapi_h264_decoder.h',

- 'common/gpu/media/vaapi_h264_dpb.cc',

- 'common/gpu/media/vaapi_h264_dpb.h',

'common/gpu/media/vaapi_jpeg_decoder.cc',

'common/gpu/media/vaapi_jpeg_decoder.h',

'common/gpu/media/vaapi_picture.cc',