diff options
| author | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-12 01:22:08 +0000 |
|---|---|---|
| committer | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-12 01:22:08 +0000 |
| commit | 7b3cd164793d6dbf31dd340ad19f0bce61c8a2bc (patch) | |
| tree | b9fdd2068d1e8260b18676a5fe3703db3c947ca3 /media/media.gyp | |
| parent | 957aaba4166a51a2cf8125598f721a4685fef233 (diff) | |
| download | chromium_src-7b3cd164793d6dbf31dd340ad19f0bce61c8a2bc.zip chromium_src-7b3cd164793d6dbf31dd340ad19f0bce61c8a2bc.tar.gz chromium_src-7b3cd164793d6dbf31dd340ad19f0bce61c8a2bc.tar.bz2 | |
Implement GLES video renderer in player_x11
This patch does the following:
1. Split the implementation of X11 and GL into two separate files
2. Add implementation of GLES render
Review URL: http://codereview.chromium.org/596055
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38867 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/media.gyp')
| -rw-r--r-- | media/media.gyp | 40 |
1 files changed, 37 insertions, 3 deletions
diff --git a/media/media.gyp b/media/media.gyp index 33481b5..c825fb3 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', + ], + }], ], }, ], |