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

Side by Side Diff: media/media.gyp

Issue 10592014: media/audio/linux: Add CrasInputStream. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: rebase before trying cq Created 8 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
« no previous file with comments | « media/audio/linux/cras_input_unittest.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 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 'audio/linux/audio_manager_linux.cc', 79 'audio/linux/audio_manager_linux.cc',
80 'audio/linux/audio_manager_linux.h', 80 'audio/linux/audio_manager_linux.h',
81 'audio/linux/alsa_input.cc', 81 'audio/linux/alsa_input.cc',
82 'audio/linux/alsa_input.h', 82 'audio/linux/alsa_input.h',
83 'audio/linux/alsa_output.cc', 83 'audio/linux/alsa_output.cc',
84 'audio/linux/alsa_output.h', 84 'audio/linux/alsa_output.h',
85 'audio/linux/alsa_util.cc', 85 'audio/linux/alsa_util.cc',
86 'audio/linux/alsa_util.h', 86 'audio/linux/alsa_util.h',
87 'audio/linux/alsa_wrapper.cc', 87 'audio/linux/alsa_wrapper.cc',
88 'audio/linux/alsa_wrapper.h', 88 'audio/linux/alsa_wrapper.h',
89 'audio/linux/cras_input.cc',
90 'audio/linux/cras_input.h',
89 'audio/linux/cras_output.cc', 91 'audio/linux/cras_output.cc',
90 'audio/linux/cras_output.h', 92 'audio/linux/cras_output.h',
91 'audio/openbsd/audio_manager_openbsd.cc', 93 'audio/openbsd/audio_manager_openbsd.cc',
92 'audio/openbsd/audio_manager_openbsd.h', 94 'audio/openbsd/audio_manager_openbsd.h',
93 'audio/mac/audio_input_mac.cc', 95 'audio/mac/audio_input_mac.cc',
94 'audio/mac/audio_input_mac.h', 96 'audio/mac/audio_input_mac.h',
95 'audio/mac/audio_low_latency_input_mac.cc', 97 'audio/mac/audio_low_latency_input_mac.cc',
96 'audio/mac/audio_low_latency_input_mac.h', 98 'audio/mac/audio_low_latency_input_mac.h',
97 'audio/mac/audio_low_latency_output_mac.cc', 99 'audio/mac/audio_low_latency_output_mac.cc',
98 'audio/mac/audio_low_latency_output_mac.h', 100 'audio/mac/audio_low_latency_output_mac.h',
(...skipping 296 matching lines...) Expand 10 before | Expand all | Expand 10 after
395 'link_settings': { 397 'link_settings': {
396 'libraries': [ 398 'libraries': [
397 '<!@(<(pkg-config) --libs libcras)', 399 '<!@(<(pkg-config) --libs libcras)',
398 ], 400 ],
399 }, 401 },
400 'defines': [ 402 'defines': [
401 'USE_CRAS', 403 'USE_CRAS',
402 ], 404 ],
403 }, { # else: use_cras == 0 405 }, { # else: use_cras == 0
404 'sources!': [ 406 'sources!': [
407 'audio/linux/cras_input.cc',
408 'audio/linux/cras_input.h',
405 'audio/linux/cras_output.cc', 409 'audio/linux/cras_output.cc',
406 'audio/linux/cras_output.h', 410 'audio/linux/cras_output.h',
407 ], 411 ],
408 }], 412 }],
409 ], 413 ],
410 }], 414 }],
411 ['os_posix == 1', { 415 ['os_posix == 1', {
412 'conditions': [ 416 'conditions': [
413 ['use_pulseaudio == 1', { 417 ['use_pulseaudio == 1', {
414 'cflags': [ 418 'cflags': [
(...skipping 338 matching lines...) Expand 10 before | Expand all | Expand 10 after
753 'filters/pipeline_integration_test.cc', 757 'filters/pipeline_integration_test.cc',
754 'filters/pipeline_integration_test_base.cc', 758 'filters/pipeline_integration_test_base.cc',
755 'mp4/mp4_stream_parser_unittest.cc', 759 'mp4/mp4_stream_parser_unittest.cc',
756 'webm/webm_cluster_parser_unittest.cc', 760 'webm/webm_cluster_parser_unittest.cc',
757 ], 761 ],
758 }], 762 }],
759 ['OS == "linux"', { 763 ['OS == "linux"', {
760 'conditions': [ 764 'conditions': [
761 ['use_cras == 1', { 765 ['use_cras == 1', {
762 'sources': [ 766 'sources': [
767 'audio/linux/cras_input_unittest.cc',
763 'audio/linux/cras_output_unittest.cc', 768 'audio/linux/cras_output_unittest.cc',
764 ], 769 ],
765 'defines': [ 770 'defines': [
766 'USE_CRAS', 771 'USE_CRAS',
767 ], 772 ],
768 }], 773 }],
769 ], 774 ],
770 }], 775 }],
771 [ 'target_arch=="ia32" or target_arch=="x64"', { 776 [ 'target_arch=="ia32" or target_arch=="x64"', {
772 'sources': [ 777 'sources': [
(...skipping 340 matching lines...) Expand 10 before | Expand all | Expand 10 after
1113 '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg', 1118 '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
1114 ], 1119 ],
1115 'sources': [ 1120 'sources': [
1116 'tools/media_bench/media_bench.cc', 1121 'tools/media_bench/media_bench.cc',
1117 ], 1122 ],
1118 }, 1123 },
1119 ], 1124 ],
1120 }] 1125 }]
1121 ], 1126 ],
1122 } 1127 }
OLDNEW
« no previous file with comments | « media/audio/linux/cras_input_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698