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

Unified Diff: content/content_common.gypi

Issue 240113009: Enable HW VAVDA by libva-wayland backend. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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:
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 45e9d2c18b852333f36ebc67fb003d2f9170169d..08cf32661a734de6abeaf4fcf57bc9df9b8e610e 100644
--- a/content/content_common.gypi
+++ b/content/content_common.gypi
@@ -627,22 +627,44 @@
],
},
}],
- ['target_arch != "arm" and chromeos == 1 and use_x11 == 1', {
+ ['target_arch != "arm" and chromeos == 1', {
'sources': [
'common/gpu/media/h264_dpb.cc',
'common/gpu/media/h264_dpb.h',
'common/gpu/media/va_surface.h',
'common/gpu/media/vaapi_h264_decoder.cc',
'common/gpu/media/vaapi_h264_decoder.h',
- 'common/gpu/media/vaapi_video_decode_accelerator.cc',
'common/gpu/media/vaapi_video_decode_accelerator.h',
'common/gpu/media/vaapi_wrapper.cc',
'common/gpu/media/vaapi_wrapper.h',
],
+ 'conditions': [
+ [ 'use_x11 == 1', {
+ 'variables': {
+ 'extra_header': 'common/gpu/media/va_stub_header.fragment',
+ 'sig_files': ['common/gpu/media/va.sigs'],
+ },
+ 'sources': [
+ 'common/gpu/media/vaapi_video_decode_accelerator.cc',
+ ]
+ }],
+ [ 'use_ozone == 1', {
+ 'variables': {
+ 'extra_header': 'common/gpu/media/va_wayland_stub_header.fragment',
+ 'sig_files': ['common/gpu/media/va_wayland.sigs'],
+ },
+ 'link_settings': {
+ 'libraries': [
+ '-lwayland-client',
Ami GONE FROM CHROMIUM 2014/04/18 22:40:25 is this a system library?
+ ],
+ },
+ 'sources': [
+ 'common/gpu/media/vaapi_video_decode_accelerator_wayland.cc',
+ ]
+ }],
+ ],
'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',
« content/common/gpu/media/vaapi_wrapper.h ('K') | « content/common/gpu/media/vaapi_wrapper.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698