Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(180)

Side by Side Diff: media/media.gyp

Issue 1225123006: media/capture: Adding WebmMuxer class and unittests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@m_crbug262211__MSRecorder__2__libwebm_reland_in_third_party
Patch Set: miu@s comments Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 # Override to dynamically link the cras (ChromeOS audio) library. 8 # Override to dynamically link the cras (ChromeOS audio) library.
9 'use_cras%': 0, 9 'use_cras%': 0,
10 # Option e.g. for Linux distributions to link pulseaudio directly 10 # Option e.g. for Linux distributions to link pulseaudio directly
11 # (DT_NEEDED) instead of using dlopen. This helps with automated 11 # (DT_NEEDED) instead of using dlopen. This helps with automated
12 # detection of ABI mismatches and prevents silent errors. 12 # detection of ABI mismatches and prevents silent errors.
13 'linux_link_pulseaudio%': 0, 13 'linux_link_pulseaudio%': 0,
14 'conditions': [ 14 'conditions': [
15 ['OS=="android" or OS=="ios"', { 15 ['OS=="android" or OS=="ios"', {
16 # Android and iOS don't use ffmpeg or libvpx. 16 # Android and iOS don't use ffmpeg, libvpx nor libwebm.
17 'media_use_ffmpeg%': 0, 17 'media_use_ffmpeg%': 0,
18 'media_use_libvpx%': 0, 18 'media_use_libvpx%': 0,
19 'media_use_libwebm%': 0,
19 }, { # 'OS!="android" and OS!="ios"' 20 }, { # 'OS!="android" and OS!="ios"'
20 'media_use_ffmpeg%': 1, 21 'media_use_ffmpeg%': 1,
21 'media_use_libvpx%': 1, 22 'media_use_libvpx%': 1,
23 'media_use_libwebm%': 1,
22 }], 24 }],
23 # Enable ALSA and Pulse for runtime selection. 25 # Enable ALSA and Pulse for runtime selection.
24 ['(OS=="linux" or OS=="freebsd" or OS=="solaris") and (embedded!=1 or (chr omecast==1 and target_arch!="arm"))', { 26 ['(OS=="linux" or OS=="freebsd" or OS=="solaris") and (embedded!=1 or (chr omecast==1 and target_arch!="arm"))', {
25 # ALSA is always needed for Web MIDI even if the cras is enabled. 27 # ALSA is always needed for Web MIDI even if the cras is enabled.
26 'use_alsa%': 1, 28 'use_alsa%': 1,
27 'conditions': [ 29 'conditions': [
28 ['use_cras==1', { 30 ['use_cras==1', {
29 'use_pulseaudio%': 0, 31 'use_pulseaudio%': 0,
30 }, { 32 }, {
31 'use_pulseaudio%': 1, 33 'use_pulseaudio%': 1,
(...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after
253 'base/byte_queue.cc', 255 'base/byte_queue.cc',
254 'base/byte_queue.h', 256 'base/byte_queue.h',
255 'base/cdm_callback_promise.cc', 257 'base/cdm_callback_promise.cc',
256 'base/cdm_callback_promise.h', 258 'base/cdm_callback_promise.h',
257 'base/cdm_config.h', 259 'base/cdm_config.h',
258 'base/cdm_context.cc', 260 'base/cdm_context.cc',
259 'base/cdm_context.h', 261 'base/cdm_context.h',
260 'base/cdm_factory.cc', 262 'base/cdm_factory.cc',
261 'base/cdm_factory.h', 263 'base/cdm_factory.h',
262 'base/cdm_initialized_promise.cc', 264 'base/cdm_initialized_promise.cc',
263 'base/cdm_initialized_promise.h', 265 'base/cdm_initialized_promise.h',
264 'base/cdm_key_information.cc', 266 'base/cdm_key_information.cc',
265 'base/cdm_key_information.h', 267 'base/cdm_key_information.h',
266 'base/cdm_promise.cc', 268 'base/cdm_promise.cc',
267 'base/cdm_promise.h', 269 'base/cdm_promise.h',
268 'base/cdm_promise_adapter.cc', 270 'base/cdm_promise_adapter.cc',
269 'base/cdm_promise_adapter.h', 271 'base/cdm_promise_adapter.h',
270 'base/channel_mixer.cc', 272 'base/channel_mixer.cc',
271 'base/channel_mixer.h', 273 'base/channel_mixer.h',
272 'base/channel_mixing_matrix.cc', 274 'base/channel_mixing_matrix.cc',
273 'base/channel_mixing_matrix.h', 275 'base/channel_mixing_matrix.h',
(...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after
474 'capture/video/win/sink_filter_win.cc', 476 'capture/video/win/sink_filter_win.cc',
475 'capture/video/win/sink_filter_win.h', 477 'capture/video/win/sink_filter_win.h',
476 'capture/video/win/sink_input_pin_win.cc', 478 'capture/video/win/sink_input_pin_win.cc',
477 'capture/video/win/sink_input_pin_win.h', 479 'capture/video/win/sink_input_pin_win.h',
478 'capture/video/win/video_capture_device_factory_win.cc', 480 'capture/video/win/video_capture_device_factory_win.cc',
479 'capture/video/win/video_capture_device_factory_win.h', 481 'capture/video/win/video_capture_device_factory_win.h',
480 'capture/video/win/video_capture_device_mf_win.cc', 482 'capture/video/win/video_capture_device_mf_win.cc',
481 'capture/video/win/video_capture_device_mf_win.h', 483 'capture/video/win/video_capture_device_mf_win.h',
482 'capture/video/win/video_capture_device_win.cc', 484 'capture/video/win/video_capture_device_win.cc',
483 'capture/video/win/video_capture_device_win.h', 485 'capture/video/win/video_capture_device_win.h',
486 'capture/webm_muxer.cc',
487 'capture/webm_muxer.h',
484 'cdm/aes_decryptor.cc', 488 'cdm/aes_decryptor.cc',
485 'cdm/aes_decryptor.h', 489 'cdm/aes_decryptor.h',
486 'cdm/default_cdm_factory.cc', 490 'cdm/default_cdm_factory.cc',
487 'cdm/default_cdm_factory.h', 491 'cdm/default_cdm_factory.h',
488 'cdm/json_web_key.cc', 492 'cdm/json_web_key.cc',
489 'cdm/json_web_key.h', 493 'cdm/json_web_key.h',
490 'cdm/key_system_names.cc', 494 'cdm/key_system_names.cc',
491 'cdm/key_system_names.h', 495 'cdm/key_system_names.h',
492 'cdm/player_tracker_impl.cc', 496 'cdm/player_tracker_impl.cc',
493 'cdm/player_tracker_impl.h', 497 'cdm/player_tracker_impl.h',
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after
684 'defines': [ 688 'defines': [
685 'MEDIA_DISABLE_LIBVPX', 689 'MEDIA_DISABLE_LIBVPX',
686 ], 690 ],
687 }, 691 },
688 # Exclude the sources that depend on libvpx. 692 # Exclude the sources that depend on libvpx.
689 'sources!': [ 693 'sources!': [
690 'filters/vpx_video_decoder.cc', 694 'filters/vpx_video_decoder.cc',
691 'filters/vpx_video_decoder.h', 695 'filters/vpx_video_decoder.h',
692 ], 696 ],
693 }], 697 }],
698 ['media_use_libwebm==1', {
699 'dependencies': [
700 '<(DEPTH)/third_party/libwebm/libwebm.gyp:libwebm',
701 ],
702 }, { # media_use_libwebm==0
703 # Exclude the sources that depend on libwebm.
704 'sources!': [
705 'capture/webm_muxer.cc',
706 'capture/webm_muxer.h',
707 ],
708 }],
694 ['enable_browser_cdms==1', { 709 ['enable_browser_cdms==1', {
695 'sources': [ 710 'sources': [
696 'base/browser_cdm.cc', 711 'base/browser_cdm.cc',
697 'base/browser_cdm.h', 712 'base/browser_cdm.h',
698 'base/browser_cdm_factory.cc', 713 'base/browser_cdm_factory.cc',
699 'base/browser_cdm_factory.h', 714 'base/browser_cdm_factory.h',
700 ], 715 ],
701 }], 716 }],
702 ['OS=="android"', { 717 ['OS=="android"', {
703 'dependencies': [ 718 'dependencies': [
(...skipping 519 matching lines...) Expand 10 before | Expand all | Expand 10 after
1223 'filters/h264_parser_unittest.cc', 1238 'filters/h264_parser_unittest.cc',
1224 'filters/in_memory_url_protocol_unittest.cc', 1239 'filters/in_memory_url_protocol_unittest.cc',
1225 'filters/jpeg_parser_unittest.cc', 1240 'filters/jpeg_parser_unittest.cc',
1226 'filters/source_buffer_stream_unittest.cc', 1241 'filters/source_buffer_stream_unittest.cc',
1227 'filters/video_cadence_estimator_unittest.cc', 1242 'filters/video_cadence_estimator_unittest.cc',
1228 'filters/video_decoder_selector_unittest.cc', 1243 'filters/video_decoder_selector_unittest.cc',
1229 'filters/video_frame_stream_unittest.cc', 1244 'filters/video_frame_stream_unittest.cc',
1230 'filters/video_renderer_algorithm_unittest.cc', 1245 'filters/video_renderer_algorithm_unittest.cc',
1231 'filters/vp8_bool_decoder_unittest.cc', 1246 'filters/vp8_bool_decoder_unittest.cc',
1232 'filters/vp8_parser_unittest.cc', 1247 'filters/vp8_parser_unittest.cc',
1248 'capture/webm_muxer_unittest.cc',
1233 'formats/common/offset_byte_queue_unittest.cc', 1249 'formats/common/offset_byte_queue_unittest.cc',
1234 'formats/webm/cluster_builder.cc', 1250 'formats/webm/cluster_builder.cc',
1235 'formats/webm/cluster_builder.h', 1251 'formats/webm/cluster_builder.h',
1236 'formats/webm/opus_packet_builder.cc', 1252 'formats/webm/opus_packet_builder.cc',
1237 'formats/webm/opus_packet_builder.h', 1253 'formats/webm/opus_packet_builder.h',
1238 'formats/webm/tracks_builder.cc', 1254 'formats/webm/tracks_builder.cc',
1239 'formats/webm/tracks_builder.h', 1255 'formats/webm/tracks_builder.h',
1240 'formats/webm/webm_cluster_parser_unittest.cc', 1256 'formats/webm/webm_cluster_parser_unittest.cc',
1241 'formats/webm/webm_content_encodings_client_unittest.cc', 1257 'formats/webm/webm_content_encodings_client_unittest.cc',
1242 'formats/webm/webm_parser_unittest.cc', 1258 'formats/webm/webm_parser_unittest.cc',
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
1276 'filters/ffmpeg_aac_bitstream_converter_unittest.cc', 1292 'filters/ffmpeg_aac_bitstream_converter_unittest.cc',
1277 'filters/ffmpeg_demuxer_unittest.cc', 1293 'filters/ffmpeg_demuxer_unittest.cc',
1278 'filters/ffmpeg_glue_unittest.cc', 1294 'filters/ffmpeg_glue_unittest.cc',
1279 'filters/ffmpeg_h264_to_annex_b_bitstream_converter_unittest.cc', 1295 'filters/ffmpeg_h264_to_annex_b_bitstream_converter_unittest.cc',
1280 'filters/ffmpeg_video_decoder_unittest.cc', 1296 'filters/ffmpeg_video_decoder_unittest.cc',
1281 'filters/in_memory_url_protocol_unittest.cc', 1297 'filters/in_memory_url_protocol_unittest.cc',
1282 'test/pipeline_integration_test.cc', 1298 'test/pipeline_integration_test.cc',
1283 'test/pipeline_integration_test_base.cc', 1299 'test/pipeline_integration_test_base.cc',
1284 ], 1300 ],
1285 }], 1301 }],
1302 ['media_use_libwebm==1', {
1303 'dependencies': [
1304 '<(DEPTH)/third_party/libwebm/libwebm.gyp:libwebm',
1305 ],
1306 }, { # media_use_libwebm==0
1307 # Exclude the sources that depend on libwebm.
1308 'sources!': [
1309 'capture/webm_muxer_unittest.cc',
1310 ],
1311 }],
1312
1286 ['(os_posix==1 and OS!="mac") or (OS=="win" and component!="shared_libra ry" and win_use_allocator_shim==1)', { 1313 ['(os_posix==1 and OS!="mac") or (OS=="win" and component!="shared_libra ry" and win_use_allocator_shim==1)', {
1287 'conditions': [ 1314 'conditions': [
1288 ['use_allocator!="none"', { 1315 ['use_allocator!="none"', {
1289 'dependencies': [ 1316 'dependencies': [
1290 '../base/allocator/allocator.gyp:allocator', 1317 '../base/allocator/allocator.gyp:allocator',
1291 ], 1318 ],
1292 }], 1319 }],
1293 ], 1320 ],
1294 }], 1321 }],
1295 ['OS=="android"', { 1322 ['OS=="android"', {
(...skipping 695 matching lines...) Expand 10 before | Expand all | Expand 10 after
1991 'dependencies': [ 2018 'dependencies': [
1992 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 2019 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
1993 ], 2020 ],
1994 }], 2021 }],
1995 ], 2022 ],
1996 }, 2023 },
1997 ], 2024 ],
1998 }], 2025 }],
1999 ], 2026 ],
2000 } 2027 }
OLDNEW
« media/capture/webm_muxer_unittest.cc ('K') | « media/capture/webm_muxer_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698