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

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: allow repeated starts 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
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 286 matching lines...) Expand 10 before | Expand all | Expand 10 after
385 'link_settings': { 387 'link_settings': {
386 'libraries': [ 388 'libraries': [
387 '<!@(<(pkg-config) --libs libcras)', 389 '<!@(<(pkg-config) --libs libcras)',
388 ], 390 ],
389 }, 391 },
390 'defines': [ 392 'defines': [
391 'USE_CRAS', 393 'USE_CRAS',
392 ], 394 ],
393 }, { # else: use_cras == 0 395 }, { # else: use_cras == 0
394 'sources!': [ 396 'sources!': [
397 'audio/linux/cras_input.cc',
398 'audio/linux/cras_input.h',
395 'audio/linux/cras_output.cc', 399 'audio/linux/cras_output.cc',
396 'audio/linux/cras_output.h', 400 'audio/linux/cras_output.h',
397 ], 401 ],
398 }], 402 }],
399 ], 403 ],
400 }], 404 }],
401 ['os_posix == 1', { 405 ['os_posix == 1', {
402 'conditions': [ 406 'conditions': [
403 ['use_pulseaudio == 1', { 407 ['use_pulseaudio == 1', {
404 'cflags': [ 408 'cflags': [
(...skipping 328 matching lines...) Expand 10 before | Expand all | Expand 10 after
733 'filters/pipeline_integration_test.cc', 737 'filters/pipeline_integration_test.cc',
734 'filters/pipeline_integration_test_base.cc', 738 'filters/pipeline_integration_test_base.cc',
735 'mp4/mp4_stream_parser_unittest.cc', 739 'mp4/mp4_stream_parser_unittest.cc',
736 'webm/webm_cluster_parser_unittest.cc', 740 'webm/webm_cluster_parser_unittest.cc',
737 ], 741 ],
738 }], 742 }],
739 ['OS == "linux"', { 743 ['OS == "linux"', {
740 'conditions': [ 744 'conditions': [
741 ['use_cras == 1', { 745 ['use_cras == 1', {
742 'sources': [ 746 'sources': [
747 'audio/linux/cras_input_unittest.cc',
743 'audio/linux/cras_output_unittest.cc', 748 'audio/linux/cras_output_unittest.cc',
744 ], 749 ],
745 'defines': [ 750 'defines': [
746 'USE_CRAS', 751 'USE_CRAS',
747 ], 752 ],
748 }], 753 }],
749 ], 754 ],
750 }], 755 }],
751 [ 'target_arch=="ia32" or target_arch=="x64"', { 756 [ 'target_arch=="ia32" or target_arch=="x64"', {
752 'sources': [ 757 'sources': [
(...skipping 336 matching lines...) Expand 10 before | Expand all | Expand 10 after
1089 '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg', 1094 '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
1090 ], 1095 ],
1091 'sources': [ 1096 'sources': [
1092 'tools/media_bench/media_bench.cc', 1097 'tools/media_bench/media_bench.cc',
1093 ], 1098 ],
1094 }, 1099 },
1095 ], 1100 ],
1096 }] 1101 }]
1097 ], 1102 ],
1098 } 1103 }
OLDNEW
« media/audio/linux/cras_input_unittest.cc ('K') | « 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