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

Unified Diff: media/media.gyp

Issue 596055: Implement GLES video renderer in player_x11 (Closed)
Patch Set: nits fixed Created 10 years, 10 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: media/media.gyp
diff --git a/media/media.gyp b/media/media.gyp
index 33481b5ff9604ffebc7858ba9127c1d673bd1e95..c825fb354a64e75610900bbb030723168a06c46c 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -5,6 +5,7 @@
{
'variables': {
'chromium_code': 1,
+ 'player_x11_renderer%': 'x11',
},
'target_defaults': {
'conditions': [
@@ -371,7 +372,6 @@
'dependencies': [
'media',
'../base/base.gyp:base',
- '../gpu/gpu.gyp:gl_libs',
],
'link_settings': {
'libraries': [
@@ -383,8 +383,42 @@
},
'sources': [
'tools/player_x11/player_x11.cc',
- 'tools/player_x11/x11_video_renderer.cc',
- 'tools/player_x11/x11_video_renderer.h',
+ ],
+ 'conditions' : [
+ ['player_x11_renderer == "x11"', {
+ 'sources': [
+ 'tools/player_x11/x11_video_renderer.cc',
+ 'tools/player_x11/x11_video_renderer.h',
+ ],
+ 'defines': [
+ 'RENDERER_X11',
+ ],
+ }],
+ ['player_x11_renderer == "gles"', {
+ 'libraries': [
+ '-lEGL',
+ '-lGLESv2',
+ ],
+ 'sources': [
+ 'tools/player_x11/gles_video_renderer.cc',
+ 'tools/player_x11/gles_video_renderer.h',
+ ],
+ 'defines': [
+ 'RENDERER_GLES',
+ ],
+ }],
+ ['player_x11_renderer == "gl"', {
+ 'dependencies': [
+ '../gpu/gpu.gyp:gl_libs',
+ ],
+ 'sources': [
+ 'tools/player_x11/gl_video_renderer.cc',
+ 'tools/player_x11/gl_video_renderer.h',
+ ],
+ 'defines': [
+ 'RENDERER_GL',
+ ],
+ }],
],
},
],
« no previous file with comments | « no previous file | media/tools/player_x11/gl_video_renderer.h » ('j') | media/tools/player_x11/gl_video_renderer.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698