| Index: media/media.gyp
|
| diff --git a/media/media.gyp b/media/media.gyp
|
| index 530643dffa27b36e66b2c731f800b45221d7c557..838cee4f52891ffdd32cffa02d6fbcd89b3973d4 100644
|
| --- a/media/media.gyp
|
| +++ b/media/media.gyp
|
| @@ -16,9 +16,11 @@
|
| # Android and iOS don't use ffmpeg or libvpx.
|
| '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',
|
| @@ -504,6 +506,8 @@
|
| 'filters/vp8_parser.h',
|
| 'filters/vpx_video_decoder.cc',
|
| 'filters/vpx_video_decoder.h',
|
| + 'filters/webm_muxer.cc',
|
| + 'filters/webm_muxer.h',
|
| 'filters/webvtt_util.h',
|
| 'filters/wsola_internals.cc',
|
| 'filters/wsola_internals.h',
|
| @@ -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!': [
|
| + 'filters/webm_muxer.cc',
|
| + 'filters/webm_muxer.h',
|
| + ],
|
| + }],
|
| ['enable_browser_cdms==1', {
|
| 'sources': [
|
| 'base/browser_cdm.cc',
|
| @@ -1225,6 +1240,7 @@
|
| 'filters/video_renderer_algorithm_unittest.cc',
|
| 'filters/vp8_bool_decoder_unittest.cc',
|
| 'filters/vp8_parser_unittest.cc',
|
| + 'filters/webm_muxer_unittest.cc',
|
| 'formats/common/offset_byte_queue_unittest.cc',
|
| 'formats/webm/cluster_builder.cc',
|
| 'formats/webm/cluster_builder.h',
|
| @@ -1280,6 +1296,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!': [
|
| + 'filters/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"', {
|
|
|