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

Side by Side Diff: media/media.gyp

Issue 10952024: Adding pulseaudio input support to chrome (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: moved the pulse code to AudioManagerPulse, and addressed Dale's comments. Created 7 years, 10 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 | Annotate | Revision Log
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 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 'audio/mac/audio_output_mac.cc', 130 'audio/mac/audio_output_mac.cc',
131 'audio/mac/audio_output_mac.h', 131 'audio/mac/audio_output_mac.h',
132 'audio/mac/audio_synchronized_mac.cc', 132 'audio/mac/audio_synchronized_mac.cc',
133 'audio/mac/audio_synchronized_mac.h', 133 'audio/mac/audio_synchronized_mac.h',
134 'audio/mac/audio_unified_mac.cc', 134 'audio/mac/audio_unified_mac.cc',
135 'audio/mac/audio_unified_mac.h', 135 'audio/mac/audio_unified_mac.h',
136 'audio/null_audio_sink.cc', 136 'audio/null_audio_sink.cc',
137 'audio/null_audio_sink.h', 137 'audio/null_audio_sink.h',
138 'audio/openbsd/audio_manager_openbsd.cc', 138 'audio/openbsd/audio_manager_openbsd.cc',
139 'audio/openbsd/audio_manager_openbsd.h', 139 'audio/openbsd/audio_manager_openbsd.h',
140 'audio/pulse/audio_manager_pulse.cc',
141 'audio/pulse/audio_manager_pulse.h',
140 'audio/pulse/pulse_output.cc', 142 'audio/pulse/pulse_output.cc',
141 'audio/pulse/pulse_output.h', 143 'audio/pulse/pulse_output.h',
144 'audio/pulse/pulse_input.cc',
145 'audio/pulse/pulse_input.h',
146 'audio/pulse/pulse_util.cc',
147 'audio/pulse/pulse_util.h',
142 'audio/sample_rates.cc', 148 'audio/sample_rates.cc',
143 'audio/sample_rates.h', 149 'audio/sample_rates.h',
144 'audio/scoped_loop_observer.cc', 150 'audio/scoped_loop_observer.cc',
145 'audio/scoped_loop_observer.h', 151 'audio/scoped_loop_observer.h',
146 'audio/simple_sources.cc', 152 'audio/simple_sources.cc',
147 'audio/simple_sources.h', 153 'audio/simple_sources.h',
148 'audio/virtual_audio_input_stream.cc', 154 'audio/virtual_audio_input_stream.cc',
149 'audio/virtual_audio_input_stream.h', 155 'audio/virtual_audio_input_stream.h',
150 'audio/virtual_audio_output_stream.cc', 156 'audio/virtual_audio_output_stream.cc',
151 'audio/virtual_audio_output_stream.h', 157 'audio/virtual_audio_output_stream.h',
(...skipping 455 matching lines...) Expand 10 before | Expand all | Expand 10 after
607 'link_settings': { 613 'link_settings': {
608 'libraries': [ 614 'libraries': [
609 '<!@(pkg-config --libs-only-l libpulse)', 615 '<!@(pkg-config --libs-only-l libpulse)',
610 ], 616 ],
611 }, 617 },
612 'defines': [ 618 'defines': [
613 'USE_PULSEAUDIO', 619 'USE_PULSEAUDIO',
614 ], 620 ],
615 }, { # else: use_pulseaudio == 0 621 }, { # else: use_pulseaudio == 0
616 'sources!': [ 622 'sources!': [
623 'audio/pulse/audio_manager_pulse.cc',
624 'audio/pulse/audio_manager_pulse.h',
625 'audio/pulse/pulse_input.cc',
626 'audio/pulse/pulse_input.h',
617 'audio/pulse/pulse_output.cc', 627 'audio/pulse/pulse_output.cc',
618 'audio/pulse/pulse_output.h', 628 'audio/pulse/pulse_output.h',
619 ], 629 ],
620 }], 630 }],
621 ], 631 ],
622 'sources!': [ 632 'sources!': [
623 'video/capture/video_capture_device_dummy.cc', 633 'video/capture/video_capture_device_dummy.cc',
624 'video/capture/video_capture_device_dummy.h', 634 'video/capture/video_capture_device_dummy.h',
625 ], 635 ],
626 }], 636 }],
627 ['OS=="mac"', { 637 ['OS=="mac"', {
628 'link_settings': { 638 'link_settings': {
629 'libraries': [ 639 'libraries': [
630 '$(SDKROOT)/System/Library/Frameworks/AudioToolbox.framework', 640 '$(SDKROOT)/System/Library/Frameworks/AudioToolbox.framework',
631 '$(SDKROOT)/System/Library/Frameworks/AudioUnit.framework', 641 '$(SDKROOT)/System/Library/Frameworks/AudioUnit.framework',
632 '$(SDKROOT)/System/Library/Frameworks/CoreAudio.framework', 642 '$(SDKROOT)/System/Library/Frameworks/CoreAudio.framework',
633 '$(SDKROOT)/System/Library/Frameworks/CoreVideo.framework', 643 '$(SDKROOT)/System/Library/Frameworks/CoreVideo.framework',
634 '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework', 644 '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework',
635 '$(SDKROOT)/System/Library/Frameworks/QTKit.framework', 645 '$(SDKROOT)/System/Library/Frameworks/QTKit.framework',
636 ], 646 ],
637 }, 647 },
638 }], 648 }],
639 ['OS=="win"', { 649 ['OS=="win"', {
640 'sources!': [ 650 'sources!': [
651 'audio/pulse/audio_manager_pulse.cc',
652 'audio/pulse/audio_manager_pulse.h',
653 'audio/pulse/pulse_input.cc',
654 'audio/pulse/pulse_input.h',
641 'audio/pulse/pulse_output.cc', 655 'audio/pulse/pulse_output.cc',
642 'audio/pulse/pulse_output.h', 656 'audio/pulse/pulse_output.h',
643 'video/capture/video_capture_device_dummy.cc', 657 'video/capture/video_capture_device_dummy.cc',
644 'video/capture/video_capture_device_dummy.h', 658 'video/capture/video_capture_device_dummy.h',
645 ], 659 ],
646 'link_settings': { 660 'link_settings': {
647 'libraries': [ 661 'libraries': [
648 '-lmf.lib', 662 '-lmf.lib',
649 '-lmfplat.lib', 663 '-lmfplat.lib',
650 '-lmfreadwrite.lib', 664 '-lmfreadwrite.lib',
(...skipping 823 matching lines...) Expand 10 before | Expand all | Expand 10 after
1474 ], 1488 ],
1475 'sources': [ 1489 'sources': [
1476 'video/capture/screen/differ_block_sse2.cc', 1490 'video/capture/screen/differ_block_sse2.cc',
1477 'video/capture/screen/differ_block_sse2.h', 1491 'video/capture/screen/differ_block_sse2.h',
1478 ], 1492 ],
1479 }, # end of target differ_block_sse2 1493 }, # end of target differ_block_sse2
1480 ], 1494 ],
1481 }], 1495 }],
1482 ], 1496 ],
1483 } 1497 }
OLDNEW
« media/audio/pulse/pulse_input.h ('K') | « media/audio/pulse/pulse_util.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698