| Index: media/media.gyp
|
| diff --git a/media/media.gyp b/media/media.gyp
|
| index e3cadc172b48c65d23b5b12869c5619de56192c8..55b229078895602ae0ab4c53086627d74c451e84 100644
|
| --- a/media/media.gyp
|
| +++ b/media/media.gyp
|
| @@ -13,12 +13,14 @@
|
| 'linux_link_pulseaudio%': 0,
|
| 'conditions': [
|
| ['OS=="android" or OS=="ios"', {
|
| - # Android and iOS don't use ffmpeg or libvpx.
|
| + # Android and iOS don't use ffmpeg, libvpx nor libwebm.
|
| 'media_use_ffmpeg%': 0,
|
| 'media_use_libvpx%': 0,
|
| + 'media_use_libwebm%': 0,
|
| }, { # 'OS!="android" and OS!="ios"'
|
| 'media_use_ffmpeg%': 1,
|
| 'media_use_libvpx%': 1,
|
| + 'media_use_libwebm%': 1,
|
| }],
|
| # Enable ALSA and Pulse for runtime selection.
|
| ['(OS=="linux" or OS=="freebsd" or OS=="solaris") and (embedded!=1 or (chromecast==1 and target_arch!="arm"))', {
|
| @@ -260,7 +262,7 @@
|
| 'base/cdm_factory.cc',
|
| 'base/cdm_factory.h',
|
| 'base/cdm_initialized_promise.cc',
|
| - 'base/cdm_initialized_promise.h',
|
| + 'base/cdm_initialized_promise.h',
|
| 'base/cdm_key_information.cc',
|
| 'base/cdm_key_information.h',
|
| 'base/cdm_promise.cc',
|
| @@ -481,6 +483,8 @@
|
| 'capture/video/win/video_capture_device_mf_win.h',
|
| 'capture/video/win/video_capture_device_win.cc',
|
| 'capture/video/win/video_capture_device_win.h',
|
| + 'capture/webm_muxer.cc',
|
| + 'capture/webm_muxer.h',
|
| 'cdm/aes_decryptor.cc',
|
| 'cdm/aes_decryptor.h',
|
| 'cdm/default_cdm_factory.cc',
|
| @@ -691,6 +695,17 @@
|
| 'filters/vpx_video_decoder.h',
|
| ],
|
| }],
|
| + ['media_use_libwebm==1', {
|
| + 'dependencies': [
|
| + '<(DEPTH)/third_party/libwebm/libwebm.gyp:libwebm',
|
| + ],
|
| + }, { # media_use_libwebm==0
|
| + # Exclude the sources that depend on libwebm.
|
| + 'sources!': [
|
| + 'capture/webm_muxer.cc',
|
| + 'capture/webm_muxer.h',
|
| + ],
|
| + }],
|
| ['enable_browser_cdms==1', {
|
| 'sources': [
|
| 'base/browser_cdm.cc',
|
| @@ -1230,6 +1245,7 @@
|
| 'filters/video_renderer_algorithm_unittest.cc',
|
| 'filters/vp8_bool_decoder_unittest.cc',
|
| 'filters/vp8_parser_unittest.cc',
|
| + 'capture/webm_muxer_unittest.cc',
|
| 'formats/common/offset_byte_queue_unittest.cc',
|
| 'formats/webm/cluster_builder.cc',
|
| 'formats/webm/cluster_builder.h',
|
| @@ -1283,6 +1299,17 @@
|
| 'test/pipeline_integration_test_base.cc',
|
| ],
|
| }],
|
| + ['media_use_libwebm==1', {
|
| + 'dependencies': [
|
| + '<(DEPTH)/third_party/libwebm/libwebm.gyp:libwebm',
|
| + ],
|
| + }, { # media_use_libwebm==0
|
| + # Exclude the sources that depend on libwebm.
|
| + 'sources!': [
|
| + 'capture/webm_muxer_unittest.cc',
|
| + ],
|
| + }],
|
| +
|
| ['(os_posix==1 and OS!="mac") or (OS=="win" and component!="shared_library" and win_use_allocator_shim==1)', {
|
| 'conditions': [
|
| ['use_allocator!="none"', {
|
|
|