Index: webkit/media/webkit_media.gypi |
diff --git a/webkit/media/webkit_media.gypi b/webkit/media/webkit_media.gypi |
index 81b770c5af4a0da6cc3cf95f9d3722a43f740a6a..e42915d11f0136278e92323a4cd63f6d265bd47a 100644 |
--- a/webkit/media/webkit_media.gypi |
+++ b/webkit/media/webkit_media.gypi |
@@ -12,6 +12,11 @@ |
'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, |
}, |
'targets': [ |
{ |
@@ -112,8 +117,18 @@ |
{ |
'target_name': 'clearkeycdm', |
'type': 'none', |
+ # TODO(tomfinegan): Simplify this by unconditionally including all the |
+ # decoders, and changing clearkeycdm to select which decoder to use |
+ # based on environment variables. |
'conditions': [ |
- ['use_ffmpeg == 1' , { |
+ ['use_fake_video_decoder == 1' , { |
+ 'defines': ['CLEAR_KEY_CDM_USE_FAKE_VIDEO_DECODER'], |
+ 'sources': [ |
+ 'crypto/ppapi/fake_cdm_video_decoder.cc', |
+ 'crypto/ppapi/fake_cdm_video_decoder.h', |
+ ], |
+ }], |
+ ['use_ffmpeg == 1' , { |
'defines': ['CLEAR_KEY_CDM_USE_FFMPEG_DECODER'], |
'dependencies': [ |
'<(DEPTH)/third_party/ffmpeg/ffmpeg.gyp:ffmpeg', |
@@ -121,10 +136,24 @@ |
'sources': [ |
'crypto/ppapi/ffmpeg_cdm_audio_decoder.cc', |
'crypto/ppapi/ffmpeg_cdm_audio_decoder.h', |
+ ], |
+ }], |
+ ['use_ffmpeg == 1 and use_fake_video_decoder == 0' , { |
+ 'sources': [ |
'crypto/ppapi/ffmpeg_cdm_video_decoder.cc', |
'crypto/ppapi/ffmpeg_cdm_video_decoder.h', |
], |
}], |
+ ['use_libvpx == 1 and use_fake_video_decoder == 0' , { |
+ 'defines': ['CLEAR_KEY_CDM_USE_LIBVPX_DECODER'], |
+ 'dependencies': [ |
+ '<(DEPTH)/third_party/libvpx/libvpx.gyp:libvpx', |
+ ], |
+ 'sources': [ |
+ 'crypto/ppapi/libvpx_cdm_video_decoder.cc', |
+ 'crypto/ppapi/libvpx_cdm_video_decoder.h', |
+ ], |
+ }], |
['os_posix == 1 and OS != "mac"', { |
'type': 'loadable_module', # Must be in PRODUCT_DIR for ASAN bots. |
}, { # 'os_posix != 1 or OS == "mac"' |
@@ -137,6 +166,8 @@ |
'<(DEPTH)/media/media.gyp:media', |
], |
'sources': [ |
+ 'crypto/ppapi/cdm_video_decoder.cc', |
+ 'crypto/ppapi/cdm_video_decoder.h', |
'crypto/ppapi/clear_key_cdm.cc', |
'crypto/ppapi/clear_key_cdm.h', |
], |