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

Unified Diff: content/content_common.gypi

Issue 43283002: Enable GLX/EGL backend switching while run HW video decode with libva. (Closed) Base URL: https://git.chromium.org/chromium/src.git@master
Patch Set: Created 7 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 ef8293d578f05935728354f5fdf28307706c9daf..a12aeda97f05032353128b5ddc616765e681ca85 100644
--- a/content/content_common.gypi
+++ b/content/content_common.gypi
@@ -517,7 +517,14 @@
],
},
}],
- ['target_arch != "arm" and chromeos == 1 and use_x11 == 1', {
+ ['target_arch != "arm" and OS!="win" and OS!="andorid" and OS!="ios" and use_x11 == 1', {
+ 'variables': {
+ 'use_video_glx%': 1,
+ },
+ 'use_video_glx%': '<(use_video_glx)',
+ 'dependencies': [
+ '../media/media.gyp:media',
+ ],
'sources': [
'common/gpu/media/h264_dpb.cc',
'common/gpu/media/h264_dpb.h',
@@ -532,6 +539,27 @@
'include_dirs': [
'<(DEPTH)/third_party/libva',
],
+ 'conditions': [
+ ['use_video_glx == 1 or chromeos == 1', {
+ 'defines': [
+ 'VIDEO_TEXTURE_GLX_BACKEND',
+ ],
+ }],
+ ['use_video_glx == 0 and chromeos == 0', {
+ 'defines': [
+ 'VIDEO_TEXTURE_EGL_BACKEND',
+ ],
+ 'include_dirs': [
+ '<(DEPTH)/third_party/khronos',
+ ],
+ 'link_settings': {
+ 'libraries': [
+ '-lEGL',
+ '-lGLESv2',
+ ],
+ },
+ }],
+ ],
}],
['OS=="win"', {
'dependencies': [

Powered by Google App Engine
This is Rietveld 408576698