Index: media/media.gyp |
diff --git a/media/media.gyp b/media/media.gyp |
index d73d584de4700fbfb1e160a93f02edf68b3afcdd..db021364d46896e0b2afe54366dacd960e35b9e4 100644 |
--- a/media/media.gyp |
+++ b/media/media.gyp |
@@ -477,6 +477,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', |
@@ -687,6 +689,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', |
@@ -1247,6 +1260,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', |
@@ -1306,6 +1320,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"', { |