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

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: Now better after input from xians. Created 8 years, 6 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 299 matching lines...) Expand 10 before | Expand all | Expand 10 after
398 'link_settings': { 400 'link_settings': {
399 'libraries': [ 401 'libraries': [
400 '<!@(<(pkg-config) --libs libcras)', 402 '<!@(<(pkg-config) --libs libcras)',
401 ], 403 ],
402 }, 404 },
403 'defines': [ 405 'defines': [
404 'USE_CRAS', 406 'USE_CRAS',
405 ], 407 ],
406 }, { # else: use_cras == 0 408 }, { # else: use_cras == 0
407 'sources!': [ 409 'sources!': [
410 'audio/linux/cras_input.cc',
411 'audio/linux/cras_input.h',
408 'audio/linux/cras_output.cc', 412 'audio/linux/cras_output.cc',
409 'audio/linux/cras_output.h', 413 'audio/linux/cras_output.h',
410 ], 414 ],
411 }], 415 }],
412 ], 416 ],
413 }], 417 }],
414 ['os_posix == 1', { 418 ['os_posix == 1', {
415 'conditions': [ 419 'conditions': [
416 ['use_pulseaudio == 1', { 420 ['use_pulseaudio == 1', {
417 'cflags': [ 421 'cflags': [
(...skipping 314 matching lines...) Expand 10 before | Expand all | Expand 10 after
732 'filters/pipeline_integration_test.cc', 736 'filters/pipeline_integration_test.cc',
733 'filters/pipeline_integration_test_base.cc', 737 'filters/pipeline_integration_test_base.cc',
734 'mp4/mp4_stream_parser_unittest.cc', 738 'mp4/mp4_stream_parser_unittest.cc',
735 'webm/webm_cluster_parser_unittest.cc', 739 'webm/webm_cluster_parser_unittest.cc',
736 ], 740 ],
737 }], 741 }],
738 ['OS == "linux"', { 742 ['OS == "linux"', {
739 'conditions': [ 743 'conditions': [
740 ['use_cras == 1', { 744 ['use_cras == 1', {
741 'sources': [ 745 'sources': [
746 'audio/linux/cras_input_unittest.cc',
742 'audio/linux/cras_output_unittest.cc', 747 'audio/linux/cras_output_unittest.cc',
743 ], 748 ],
744 'defines': [ 749 'defines': [
745 'USE_CRAS', 750 'USE_CRAS',
746 ], 751 ],
747 }], 752 }],
748 ], 753 ],
749 }], 754 }],
750 [ 'target_arch=="ia32" or target_arch=="x64"', { 755 [ 'target_arch=="ia32" or target_arch=="x64"', {
751 'sources': [ 756 'sources': [
(...skipping 328 matching lines...) Expand 10 before | Expand all | Expand 10 after
1080 '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg', 1085 '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
1081 ], 1086 ],
1082 'sources': [ 1087 'sources': [
1083 'tools/media_bench/media_bench.cc', 1088 'tools/media_bench/media_bench.cc',
1084 ], 1089 ],
1085 }, 1090 },
1086 ], 1091 ],
1087 }] 1092 }]
1088 ], 1093 ],
1089 } 1094 }
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