Index: media/media_cdm.gypi |
diff --git a/media/media_cdm.gypi b/media/media_cdm.gypi |
index 1068aa1580ff9980a39a898d44a69e307e141acd..ab2e393f4a2d499f5c8d69eb704de724d568bf63 100644 |
--- a/media/media_cdm.gypi |
+++ b/media/media_cdm.gypi |
@@ -3,20 +3,16 @@ |
# found in the LICENSE file. |
{ |
+ 'includes': [ |
+ 'media_variables.gypi', |
+ ], |
'variables': { |
- 'conditions': [ |
- ['OS == "android"', { |
- # Android doesn't use ffmpeg. |
- 'use_ffmpeg%': 0, |
- }, { # 'OS != "android"' |
- 'use_ffmpeg%': 1, |
- }], |
- ], |
# Set |use_fake_video_decoder| to 1 to ignore input frames in |clearkeycdm|, |
# and produce video frames filled with a solid color instead. |
'use_fake_video_decoder%': 0, |
- # Set |use_libvpx| to 1 to use libvpx for VP8 decoding in |clearkeycdm|. |
- 'use_libvpx%': 0, |
+ # Set |use_libvpx_in_clear_key_cdm| to 1 to use libvpx for VP8 decoding in |
+ # |clearkeycdm|. |
+ 'use_libvpx_in_clear_key_cdm%': 0, |
}, |
'conditions': [ |
['enable_pepper_cdms==1', { |
xhwang
2015/07/10 23:13:17
The following are all under this "enable_pepper_cd
watk
2015/07/14 23:33:57
Oops, didn't realize. Removed them.
|
@@ -39,8 +35,8 @@ |
'cdm/ppapi/external_clear_key/fake_cdm_video_decoder.h', |
], |
}], |
- ['use_ffmpeg == 1' , { |
- 'defines': ['CLEAR_KEY_CDM_USE_FFMPEG_DECODER'], |
+ ['media_use_ffmpeg == 1' , { |
+ 'defines': ['CLEAR_KEY_CDM_media_use_ffmpeg_DECODER'], |
xhwang
2015/07/10 23:13:17
Wrong search-and-replace?
watk
2015/07/14 23:33:57
Done.
|
'dependencies': [ |
'<(DEPTH)/third_party/ffmpeg/ffmpeg.gyp:ffmpeg', |
], |
@@ -49,13 +45,14 @@ |
'cdm/ppapi/external_clear_key/ffmpeg_cdm_audio_decoder.h', |
], |
}], |
- ['use_ffmpeg == 1 and use_fake_video_decoder == 0' , { |
+ # Android never includes the FFmpeg video decoders. |
+ ['media_use_ffmpeg == 1 and use_fake_video_decoder == 0 and OS != "android"' , { |
'sources': [ |
'cdm/ppapi/external_clear_key/ffmpeg_cdm_video_decoder.cc', |
'cdm/ppapi/external_clear_key/ffmpeg_cdm_video_decoder.h', |
], |
}], |
- ['use_libvpx == 1 and use_fake_video_decoder == 0' , { |
+ ['use_libvpx_in_clear_key_cdm == 1 and use_fake_video_decoder == 0' , { |
'defines': ['CLEAR_KEY_CDM_USE_LIBVPX_DECODER'], |
'dependencies': [ |
'<(DEPTH)/third_party/libvpx/libvpx.gyp:libvpx', |