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

Side by Side Diff: media/media.gyp

Issue 10907110: Create iOS Audio Manager implementation. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Response to review Created 8 years, 3 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
« no previous file with comments | « media/audio/mac/audio_input_mac.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 PulseAudio library. 8 # Override to dynamically link the PulseAudio library.
9 'use_pulseaudio%': 0, 9 'use_pulseaudio%': 0,
10 # Override to dynamically link the cras (ChromeOS audio) library. 10 # Override to dynamically link the cras (ChromeOS audio) library.
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 'audio/audio_util.cc', 82 'audio/audio_util.cc',
83 'audio/audio_util.h', 83 'audio/audio_util.h',
84 'audio/cross_process_notification.cc', 84 'audio/cross_process_notification.cc',
85 'audio/cross_process_notification.h', 85 'audio/cross_process_notification.h',
86 'audio/cross_process_notification_posix.cc', 86 'audio/cross_process_notification_posix.cc',
87 'audio/cross_process_notification_win.cc', 87 'audio/cross_process_notification_win.cc',
88 'audio/fake_audio_input_stream.cc', 88 'audio/fake_audio_input_stream.cc',
89 'audio/fake_audio_input_stream.h', 89 'audio/fake_audio_input_stream.h',
90 'audio/fake_audio_output_stream.cc', 90 'audio/fake_audio_output_stream.cc',
91 'audio/fake_audio_output_stream.h', 91 'audio/fake_audio_output_stream.h',
92 'audio/ios/audio_manager_ios.h',
93 'audio/ios/audio_manager_ios.mm',
92 'audio/linux/alsa_input.cc', 94 'audio/linux/alsa_input.cc',
93 'audio/linux/alsa_input.h', 95 'audio/linux/alsa_input.h',
94 'audio/linux/alsa_output.cc', 96 'audio/linux/alsa_output.cc',
95 'audio/linux/alsa_output.h', 97 'audio/linux/alsa_output.h',
96 'audio/linux/alsa_util.cc', 98 'audio/linux/alsa_util.cc',
97 'audio/linux/alsa_util.h', 99 'audio/linux/alsa_util.h',
98 'audio/linux/alsa_wrapper.cc', 100 'audio/linux/alsa_wrapper.cc',
99 'audio/linux/alsa_wrapper.h', 101 'audio/linux/alsa_wrapper.h',
100 'audio/linux/audio_manager_linux.cc', 102 'audio/linux/audio_manager_linux.cc',
101 'audio/linux/audio_manager_linux.h', 103 'audio/linux/audio_manager_linux.h',
(...skipping 270 matching lines...) Expand 10 before | Expand all | Expand 10 after
372 # iOS support is limited to audio input only. 374 # iOS support is limited to audio input only.
373 ['exclude', '.*'], 375 ['exclude', '.*'],
374 ['include', '^audio/audio_buffers_state\\.'], 376 ['include', '^audio/audio_buffers_state\\.'],
375 ['include', '^audio/audio_input_controller\\.'], 377 ['include', '^audio/audio_input_controller\\.'],
376 ['include', '^audio/audio_io\\.h$'], 378 ['include', '^audio/audio_io\\.h$'],
377 ['include', '^audio/audio_manager\\.'], 379 ['include', '^audio/audio_manager\\.'],
378 ['include', '^audio/audio_manager_base\\.'], 380 ['include', '^audio/audio_manager_base\\.'],
379 ['include', '^audio/audio_parameters\\.'], 381 ['include', '^audio/audio_parameters\\.'],
380 ['include', '^audio/fake_audio_input_stream\\.'], 382 ['include', '^audio/fake_audio_input_stream\\.'],
381 ['include', '^audio/fake_audio_output_stream\\.'], 383 ['include', '^audio/fake_audio_output_stream\\.'],
384 ['include', '^audio/ios/audio_manager_ios\\.'],
385 ['include', '^base/audio_bus\\.'],
382 ['include', '^base/channel_layout\\.'], 386 ['include', '^base/channel_layout\\.'],
383 ['include', '^base/media\\.h$'], 387 ['include', '^base/media\\.h$'],
384 ['include', '^base/media_stub\\.cc$'], 388 ['include', '^base/media_stub\\.cc$'],
385 ], 389 ],
386 'link_settings': { 390 'link_settings': {
387 'libraries': [ 391 'libraries': [
388 '$(SDKROOT)/System/Library/Frameworks/AudioToolbox.framework', 392 '$(SDKROOT)/System/Library/Frameworks/AudioToolbox.framework',
389 '$(SDKROOT)/System/Library/Frameworks/CoreAudio.framework', 393 '$(SDKROOT)/System/Library/Frameworks/CoreAudio.framework',
390 ], 394 ],
391 }, 395 },
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
532 'mp4/es_descriptor.h', 536 'mp4/es_descriptor.h',
533 'mp4/mp4_stream_parser.cc', 537 'mp4/mp4_stream_parser.cc',
534 'mp4/mp4_stream_parser.h', 538 'mp4/mp4_stream_parser.h',
535 'mp4/offset_byte_queue.cc', 539 'mp4/offset_byte_queue.cc',
536 'mp4/offset_byte_queue.h', 540 'mp4/offset_byte_queue.h',
537 'mp4/track_run_iterator.cc', 541 'mp4/track_run_iterator.cc',
538 'mp4/track_run_iterator.h', 542 'mp4/track_run_iterator.h',
539 ], 543 ],
540 }], 544 }],
541 ], 545 ],
546 'target_conditions': [
547 ['OS == "ios"', {
548 'sources/': [
549 # Pull in specific Mac files for iOS (which have been filtered out
550 # by file name rules).
551 ['include', '^audio/mac/audio_input_mac\\.'],
552 ],
553 }],
554 ],
542 }, 555 },
543 { 556 {
544 'target_name': 'media_unittests', 557 'target_name': 'media_unittests',
545 'type': '<(gtest_target_type)', 558 'type': '<(gtest_target_type)',
546 'dependencies': [ 559 'dependencies': [
547 'media', 560 'media',
548 'media_test_support', 561 'media_test_support',
549 '../base/base.gyp:base', 562 '../base/base.gyp:base',
550 '../base/base.gyp:base_i18n', 563 '../base/base.gyp:base_i18n',
551 '../base/base.gyp:test_support_base', 564 '../base/base.gyp:test_support_base',
552 '../testing/gmock.gyp:gmock', 565 '../testing/gmock.gyp:gmock',
553 '../testing/gtest.gyp:gtest', 566 '../testing/gtest.gyp:gtest',
554 '../ui/ui.gyp:ui', 567 '../ui/ui.gyp:ui',
555 ], 568 ],
556 'sources': [ 569 'sources': [
557 'audio/async_socket_io_handler_unittest.cc', 570 'audio/async_socket_io_handler_unittest.cc',
558 'audio/audio_input_controller_unittest.cc', 571 'audio/audio_input_controller_unittest.cc',
559 'audio/audio_input_device_unittest.cc', 572 'audio/audio_input_device_unittest.cc',
560 'audio/audio_input_unittest.cc', 573 'audio/audio_input_unittest.cc',
561 'audio/audio_input_volume_unittest.cc', 574 'audio/audio_input_volume_unittest.cc',
562 'audio/audio_low_latency_input_output_unittest.cc', 575 'audio/audio_low_latency_input_output_unittest.cc',
563 'audio/audio_output_controller_unittest.cc', 576 'audio/audio_output_controller_unittest.cc',
564 'audio/audio_output_device_unittest.cc', 577 'audio/audio_output_device_unittest.cc',
565 'audio/audio_output_proxy_unittest.cc', 578 'audio/audio_output_proxy_unittest.cc',
566 'audio/audio_parameters_unittest.cc', 579 'audio/audio_parameters_unittest.cc',
567 'audio/audio_util_unittest.cc', 580 'audio/audio_util_unittest.cc',
568 'audio/cross_process_notification_unittest.cc', 581 'audio/cross_process_notification_unittest.cc',
582 'audio/ios/audio_manager_ios_unittest.cc',
569 'audio/linux/alsa_output_unittest.cc', 583 'audio/linux/alsa_output_unittest.cc',
570 'audio/mac/audio_low_latency_input_mac_unittest.cc', 584 'audio/mac/audio_low_latency_input_mac_unittest.cc',
571 'audio/mac/audio_output_mac_unittest.cc', 585 'audio/mac/audio_output_mac_unittest.cc',
572 'audio/simple_sources_unittest.cc', 586 'audio/simple_sources_unittest.cc',
573 'audio/win/audio_low_latency_input_win_unittest.cc', 587 'audio/win/audio_low_latency_input_win_unittest.cc',
574 'audio/win/audio_low_latency_output_win_unittest.cc', 588 'audio/win/audio_low_latency_output_win_unittest.cc',
575 'audio/win/audio_output_win_unittest.cc', 589 'audio/win/audio_output_win_unittest.cc',
576 'base/audio_bus_unittest.cc', 590 'base/audio_bus_unittest.cc',
577 'base/audio_fifo_unittest.cc', 591 'base/audio_fifo_unittest.cc',
578 'base/audio_renderer_mixer_input_unittest.cc', 592 'base/audio_renderer_mixer_input_unittest.cc',
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
639 ['linux_use_tcmalloc==1', { 653 ['linux_use_tcmalloc==1', {
640 'dependencies': [ 654 'dependencies': [
641 '../base/allocator/allocator.gyp:allocator', 655 '../base/allocator/allocator.gyp:allocator',
642 ], 656 ],
643 }], 657 }],
644 ], 658 ],
645 }], 659 }],
646 ['OS == "ios"', { 660 ['OS == "ios"', {
647 'sources/': [ 661 'sources/': [
648 ['exclude', '.*'], 662 ['exclude', '.*'],
663 ['include', '^audio/audio_input_controller_unittest\\.cc$'],
664 ['include', '^audio/audio_input_unittest\\.cc$'],
649 ['include', '^audio/audio_parameters_unittest\\.cc$'], 665 ['include', '^audio/audio_parameters_unittest\\.cc$'],
666 ['include', '^audio/ios/audio_manager_ios_unittest\\.cc$'],
650 ['include', '^base/mock_reader\\.h$'], 667 ['include', '^base/mock_reader\\.h$'],
651 ['include', '^base/run_all_unittests\\.cc$'], 668 ['include', '^base/run_all_unittests\\.cc$'],
652 ], 669 ],
653 }], 670 }],
654 ['OS=="android"', { 671 ['OS=="android"', {
655 'sources!': [ 672 'sources!': [
656 'audio/audio_input_volume_unittest.cc', 673 'audio/audio_input_volume_unittest.cc',
657 'base/test_data_util.cc', 674 'base/test_data_util.cc',
658 'base/test_data_util.h', 675 'base/test_data_util.h',
659 'ffmpeg/ffmpeg_common_unittest.cc', 676 'ffmpeg/ffmpeg_common_unittest.cc',
(...skipping 585 matching lines...) Expand 10 before | Expand all | Expand 10 after
1245 'media', 1262 'media',
1246 ], 1263 ],
1247 'sources': [ 1264 'sources': [
1248 'tools/media_bench/media_bench.cc', 1265 'tools/media_bench/media_bench.cc',
1249 ], 1266 ],
1250 }, 1267 },
1251 ], 1268 ],
1252 }] 1269 }]
1253 ], 1270 ],
1254 } 1271 }
OLDNEW
« no previous file with comments | « media/audio/mac/audio_input_mac.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698