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

Unified Diff: webkit/media/webkit_media.gypi

Issue 10899021: Add CDM video decoder. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Comments addressed. Created 8 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
« no previous file with comments | « webkit/media/crypto/ppapi/ffmpeg_cdm_video_decoder.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/media/webkit_media.gypi
diff --git a/webkit/media/webkit_media.gypi b/webkit/media/webkit_media.gypi
index 9f652e267960f4e1003b29c727aeb302ff57f087..ccfda20bc9b4d19332f47eb9e4191c33ceba68fe 100644
--- a/webkit/media/webkit_media.gypi
+++ b/webkit/media/webkit_media.gypi
@@ -3,6 +3,16 @@
# found in the LICENSE file.
{
+ 'variables': {
+ 'conditions': [
+ ['OS == "android" or OS == "ios"', {
+ # Android and iOS don't use ffmpeg.
+ 'use_ffmpeg%': 0,
+ }, { # 'OS != "android" and OS != "ios"'
+ 'use_ffmpeg%': 1,
+ }],
+ ],
+ },
'targets': [
{
'target_name': 'webkit_media',
@@ -102,10 +112,22 @@
{
'target_name': 'clearkeycdm',
'type': 'shared_library',
+ 'conditions': [
+ ['use_ffmpeg == 1' , {
+ 'defines': ['CLEAR_KEY_CDM_USE_FFMPEG_DECODER'],
+ 'dependencies': [
+ '<(DEPTH)/third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
+ ],
+ 'sources': [
+ 'crypto/ppapi/ffmpeg_cdm_video_decoder.cc',
+ 'crypto/ppapi/ffmpeg_cdm_video_decoder.h',
+ ],
+ }],
+ ],
'defines': ['CDM_IMPLEMENTATION'],
'dependencies': [
'<(DEPTH)/base/base.gyp:base',
- '<(DEPTH)/media/media.gyp:media'
+ '<(DEPTH)/media/media.gyp:media',
],
'sources': [
'crypto/ppapi/clear_key_cdm.cc',
« no previous file with comments | « webkit/media/crypto/ppapi/ffmpeg_cdm_video_decoder.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698