diff options
| author | dgreid@chromium.org <dgreid@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-16 21:06:54 +0000 |
|---|---|---|
| committer | dgreid@chromium.org <dgreid@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-16 21:06:54 +0000 |
| commit | e78fa0960b66aaba6182ac9bf4d2ae8b9a83b92b (patch) | |
| tree | 7ebcd23eb5799f5e0ecfc2429034de983984aa54 /media/media.gyp | |
| parent | 0fc80bd47b7ea8cf08085a317ae422a0941886cd (diff) | |
| download | chromium_src-e78fa0960b66aaba6182ac9bf4d2ae8b9a83b92b.zip chromium_src-e78fa0960b66aaba6182ac9bf4d2ae8b9a83b92b.tar.gz chromium_src-e78fa0960b66aaba6182ac9bf4d2ae8b9a83b92b.tar.bz2 | |
media/audio/linux: Add CrasInputStream.
This parallels the CrasOutputStream that was added previously. ChromeOS
already talks to CRAS for audio input, through an alsa plug in. Remove
that unneeded layer. Only built when use_cras is set.
A following patch will pull the CRAS client connection up a level and
share one client connection for all input and output streams that are
active.
BUG=chromium-os:25410
TEST=Newly added cras_input_unittest to media_unittests. Manual test
with apprtc and youtube.com/my_webcam.
Review URL: https://chromiumcodereview.appspot.com/10592014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@146881 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/media.gyp')
| -rw-r--r-- | media/media.gyp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/media/media.gyp b/media/media.gyp index d4995d8..8d8a1e1 100644 --- a/media/media.gyp +++ b/media/media.gyp @@ -86,6 +86,8 @@ 'audio/linux/alsa_util.h', 'audio/linux/alsa_wrapper.cc', 'audio/linux/alsa_wrapper.h', + 'audio/linux/cras_input.cc', + 'audio/linux/cras_input.h', 'audio/linux/cras_output.cc', 'audio/linux/cras_output.h', 'audio/openbsd/audio_manager_openbsd.cc', @@ -398,6 +400,8 @@ ], }, { # else: use_cras == 0 'sources!': [ + 'audio/linux/cras_input.cc', + 'audio/linux/cras_input.h', 'audio/linux/cras_output.cc', 'audio/linux/cras_output.h', ], @@ -758,6 +762,7 @@ 'conditions': [ ['use_cras == 1', { 'sources': [ + 'audio/linux/cras_input_unittest.cc', 'audio/linux/cras_output_unittest.cc', ], 'defines': [ |