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

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: emircan@ nits, rebase (only media.gyp affected), removed bool from WriteCallbackCB signature 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.
miu 2015/07/16 01:46:26 Don't forget to update BUILD.gn files as well.
mcasas 2015/07/17 17:45:07 Done.
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 or libvpx.
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 223 matching lines...) Expand 10 before | Expand all | Expand 10 after
497 'filters/video_cadence_estimator.cc', 499 'filters/video_cadence_estimator.cc',
498 'filters/video_cadence_estimator.h', 500 'filters/video_cadence_estimator.h',
499 'filters/video_renderer_algorithm.cc', 501 'filters/video_renderer_algorithm.cc',
500 'filters/video_renderer_algorithm.h', 502 'filters/video_renderer_algorithm.h',
501 'filters/vp8_bool_decoder.cc', 503 'filters/vp8_bool_decoder.cc',
502 'filters/vp8_bool_decoder.h', 504 'filters/vp8_bool_decoder.h',
503 'filters/vp8_parser.cc', 505 'filters/vp8_parser.cc',
504 'filters/vp8_parser.h', 506 'filters/vp8_parser.h',
505 'filters/vpx_video_decoder.cc', 507 'filters/vpx_video_decoder.cc',
506 'filters/vpx_video_decoder.h', 508 'filters/vpx_video_decoder.h',
509 'filters/webm_muxer.cc',
510 'filters/webm_muxer.h',
507 'filters/webvtt_util.h', 511 'filters/webvtt_util.h',
508 'filters/wsola_internals.cc', 512 'filters/wsola_internals.cc',
509 'filters/wsola_internals.h', 513 'filters/wsola_internals.h',
510 'formats/common/offset_byte_queue.cc', 514 'formats/common/offset_byte_queue.cc',
511 'formats/common/offset_byte_queue.h', 515 'formats/common/offset_byte_queue.h',
512 'formats/webm/webm_audio_client.cc', 516 'formats/webm/webm_audio_client.cc',
513 'formats/webm/webm_audio_client.h', 517 'formats/webm/webm_audio_client.h',
514 'formats/webm/webm_cluster_parser.cc', 518 'formats/webm/webm_cluster_parser.cc',
515 'formats/webm/webm_cluster_parser.h', 519 'formats/webm/webm_cluster_parser.h',
516 'formats/webm/webm_constants.cc', 520 'formats/webm/webm_constants.cc',
(...skipping 167 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 'filters/webm_muxer.cc',
706 'filters/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 514 matching lines...) Expand 10 before | Expand all | Expand 10 after
1218 'filters/h264_parser_unittest.cc', 1233 'filters/h264_parser_unittest.cc',
1219 'filters/in_memory_url_protocol_unittest.cc', 1234 'filters/in_memory_url_protocol_unittest.cc',
1220 'filters/jpeg_parser_unittest.cc', 1235 'filters/jpeg_parser_unittest.cc',
1221 'filters/source_buffer_stream_unittest.cc', 1236 'filters/source_buffer_stream_unittest.cc',
1222 'filters/video_cadence_estimator_unittest.cc', 1237 'filters/video_cadence_estimator_unittest.cc',
1223 'filters/video_decoder_selector_unittest.cc', 1238 'filters/video_decoder_selector_unittest.cc',
1224 'filters/video_frame_stream_unittest.cc', 1239 'filters/video_frame_stream_unittest.cc',
1225 'filters/video_renderer_algorithm_unittest.cc', 1240 'filters/video_renderer_algorithm_unittest.cc',
1226 'filters/vp8_bool_decoder_unittest.cc', 1241 'filters/vp8_bool_decoder_unittest.cc',
1227 'filters/vp8_parser_unittest.cc', 1242 'filters/vp8_parser_unittest.cc',
1243 'filters/webm_muxer_unittest.cc',
1228 'formats/common/offset_byte_queue_unittest.cc', 1244 'formats/common/offset_byte_queue_unittest.cc',
1229 'formats/webm/cluster_builder.cc', 1245 'formats/webm/cluster_builder.cc',
1230 'formats/webm/cluster_builder.h', 1246 'formats/webm/cluster_builder.h',
1231 'formats/webm/opus_packet_builder.cc', 1247 'formats/webm/opus_packet_builder.cc',
1232 'formats/webm/opus_packet_builder.h', 1248 'formats/webm/opus_packet_builder.h',
1233 'formats/webm/tracks_builder.cc', 1249 'formats/webm/tracks_builder.cc',
1234 'formats/webm/tracks_builder.h', 1250 'formats/webm/tracks_builder.h',
1235 'formats/webm/webm_cluster_parser_unittest.cc', 1251 'formats/webm/webm_cluster_parser_unittest.cc',
1236 'formats/webm/webm_content_encodings_client_unittest.cc', 1252 'formats/webm/webm_content_encodings_client_unittest.cc',
1237 'formats/webm/webm_parser_unittest.cc', 1253 'formats/webm/webm_parser_unittest.cc',
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
1273 'filters/ffmpeg_aac_bitstream_converter_unittest.cc', 1289 'filters/ffmpeg_aac_bitstream_converter_unittest.cc',
1274 'filters/ffmpeg_demuxer_unittest.cc', 1290 'filters/ffmpeg_demuxer_unittest.cc',
1275 'filters/ffmpeg_glue_unittest.cc', 1291 'filters/ffmpeg_glue_unittest.cc',
1276 'filters/ffmpeg_h264_to_annex_b_bitstream_converter_unittest.cc', 1292 'filters/ffmpeg_h264_to_annex_b_bitstream_converter_unittest.cc',
1277 'filters/ffmpeg_video_decoder_unittest.cc', 1293 'filters/ffmpeg_video_decoder_unittest.cc',
1278 'filters/in_memory_url_protocol_unittest.cc', 1294 'filters/in_memory_url_protocol_unittest.cc',
1279 'test/pipeline_integration_test.cc', 1295 'test/pipeline_integration_test.cc',
1280 'test/pipeline_integration_test_base.cc', 1296 'test/pipeline_integration_test_base.cc',
1281 ], 1297 ],
1282 }], 1298 }],
1299 ['media_use_libwebm==1', {
1300 'dependencies': [
1301 '<(DEPTH)/third_party/libwebm/libwebm.gyp:libwebm',
1302 ],
1303 }, { # media_use_libwebm==0
1304 # Exclude the sources that depend on libwebm.
1305 'sources!': [
1306 'filters/webm_muxer_unittest.cc',
1307 ],
1308 }],
1309
1283 ['(os_posix==1 and OS!="mac") or (OS=="win" and component!="shared_libra ry" and win_use_allocator_shim==1)', { 1310 ['(os_posix==1 and OS!="mac") or (OS=="win" and component!="shared_libra ry" and win_use_allocator_shim==1)', {
1284 'conditions': [ 1311 'conditions': [
1285 ['use_allocator!="none"', { 1312 ['use_allocator!="none"', {
1286 'dependencies': [ 1313 'dependencies': [
1287 '../base/allocator/allocator.gyp:allocator', 1314 '../base/allocator/allocator.gyp:allocator',
1288 ], 1315 ],
1289 }], 1316 }],
1290 ], 1317 ],
1291 }], 1318 }],
1292 ['OS=="android"', { 1319 ['OS=="android"', {
(...skipping 695 matching lines...) Expand 10 before | Expand all | Expand 10 after
1988 'dependencies': [ 2015 'dependencies': [
1989 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 2016 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
1990 ], 2017 ],
1991 }], 2018 }],
1992 ], 2019 ],
1993 }, 2020 },
1994 ], 2021 ],
1995 }], 2022 }],
1996 ], 2023 ],
1997 } 2024 }
OLDNEW
« media/filters/webm_muxer_unittest.cc ('K') | « media/filters/webm_muxer_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698