Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(294)

Unified Diff: content/content_common.gypi

Issue 490233002: VaapiVideoAccelerator: make Vaapi accelerator work with ozone (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Missing modifications in video accelerators Created 6 years, 2 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
Index: content/content_common.gypi
diff --git a/content/content_common.gypi b/content/content_common.gypi
index 01873440518915a1bc2db8ec48012ab98a9fdb7c..6bf7d3b7ac0d6ca051365a52f094bef6d4dffc0a 100644
--- a/content/content_common.gypi
+++ b/content/content_common.gypi
@@ -762,7 +762,7 @@
'<(DEPTH)/third_party/khronos',
],
}],
- ['target_arch != "arm" and chromeos == 1 and use_x11 == 1', {
+ ['target_arch != "arm" and chromeos == 1', {
'dependencies': [
'../media/media.gyp:media',
'../third_party/libyuv/libyuv.gyp:libyuv',
@@ -773,6 +773,8 @@
'common/gpu/media/va_surface.h',
'common/gpu/media/vaapi_h264_decoder.cc',
'common/gpu/media/vaapi_h264_decoder.h',
+ 'common/gpu/media/vaapi_picture_provider.cc',
+ 'common/gpu/media/vaapi_picture_provider.h',
'common/gpu/media/vaapi_video_decode_accelerator.cc',
'common/gpu/media/vaapi_video_decode_accelerator.h',
'common/gpu/media/vaapi_video_encode_accelerator.cc',
@@ -780,10 +782,35 @@
'common/gpu/media/vaapi_wrapper.cc',
'common/gpu/media/vaapi_wrapper.h',
],
+ 'conditions': [
+ ['use_x11 == 1', {
+ 'variables': {
+ 'sig_files': [
+ 'common/gpu/media/va.sigs',
+ 'common/gpu/media/va_x11.sigs',
+ ],
+ },
+ 'sources': [
+ 'common/gpu/media/vaapi_picture_provider_x11.cc',
+ 'common/gpu/media/vaapi_picture_provider_x11.h',
+ ],
+ }],
+ ['ozone_platform_gbm == 1', {
+ 'variables': {
+ 'sig_files': [
+ 'common/gpu/media/va.sigs',
+ 'common/gpu/media/va_drm.sigs',
+ ],
+ },
+ 'sources': [
+ 'common/gpu/media/vaapi_picture_provider_drm.cc',
+ 'common/gpu/media/vaapi_picture_provider_drm.h',
+ ],
+ }],
+ ],
'variables': {
'generate_stubs_script': '../tools/generate_stubs/generate_stubs.py',
'extra_header': 'common/gpu/media/va_stub_header.fragment',
- 'sig_files': ['common/gpu/media/va.sigs'],
'outfile_type': 'posix_stubs',
'stubs_filename_root': 'va_stubs',
'project_path': 'content/common/gpu/media',

Powered by Google App Engine
This is Rietveld 408576698