diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2009-07-25 19:52:22 -0700 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2009-07-25 21:15:25 -0700 |
| commit | 9261bae1d2a769cb7453d2cadb6040be38ec86e5 (patch) | |
| tree | b9edeeb20bf20eb9f76902a9671dbe10e871717b /libs/audioflinger/AudioHardwareStub.cpp | |
| parent | 4cce5bd5ccc7c8468d0f8cc359525f82a45dedec (diff) | |
| parent | 4d3b5c1e36f2a3746a1c87f8af97d4fe97e8f49e (diff) | |
| download | frameworks_native-9261bae1d2a769cb7453d2cadb6040be38ec86e5.zip frameworks_native-9261bae1d2a769cb7453d2cadb6040be38ec86e5.tar.gz frameworks_native-9261bae1d2a769cb7453d2cadb6040be38ec86e5.tar.bz2 | |
Merge korg/donut into korg/master
Diffstat (limited to 'libs/audioflinger/AudioHardwareStub.cpp')
| -rw-r--r-- | libs/audioflinger/AudioHardwareStub.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/libs/audioflinger/AudioHardwareStub.cpp b/libs/audioflinger/AudioHardwareStub.cpp index b13cb1c..0ab4c60 100644 --- a/libs/audioflinger/AudioHardwareStub.cpp +++ b/libs/audioflinger/AudioHardwareStub.cpp @@ -23,6 +23,7 @@ #include <utils/String8.h> #include "AudioHardwareStub.h" +#include <media/AudioRecord.h> namespace android { @@ -56,9 +57,15 @@ AudioStreamOut* AudioHardwareStub::openOutputStream( } AudioStreamIn* AudioHardwareStub::openInputStream( - int format, int channelCount, uint32_t sampleRate, + int inputSource, int format, int channelCount, uint32_t sampleRate, status_t *status, AudioSystem::audio_in_acoustics acoustics) { + // check for valid input source + if ((inputSource < AudioRecord::DEFAULT_INPUT) || + (inputSource >= AudioRecord::NUM_INPUT_SOURCES)) { + return 0; + } + AudioStreamInStub* in = new AudioStreamInStub(); status_t lStatus = in->set(format, channelCount, sampleRate, acoustics); if (status) { |