diff options
| author | Glenn Kasten <gkasten@google.com> | 2012-01-27 09:06:00 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-01-27 09:06:00 -0800 |
| commit | fd267d7cf640225bb57f0ed1af44efc153275f6d (patch) | |
| tree | c97f1923f3cf143a7a8cd94184335283100c6437 /services | |
| parent | a3a2cd4072aaa2d93c91251a786eb7323f8d2c27 (diff) | |
| parent | eba51fb3a361f67a6a64d5a16eba6084fe27d60e (diff) | |
| download | frameworks_av-fd267d7cf640225bb57f0ed1af44efc153275f6d.zip frameworks_av-fd267d7cf640225bb57f0ed1af44efc153275f6d.tar.gz frameworks_av-fd267d7cf640225bb57f0ed1af44efc153275f6d.tar.bz2 | |
Merge "Use audio_source_t consistently"
Diffstat (limited to 'services')
| -rw-r--r-- | services/audioflinger/AudioPolicyService.cpp | 8 | ||||
| -rw-r--r-- | services/audioflinger/AudioPolicyService.h | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/services/audioflinger/AudioPolicyService.cpp b/services/audioflinger/AudioPolicyService.cpp index 28b1c89..2df1385 100644 --- a/services/audioflinger/AudioPolicyService.cpp +++ b/services/audioflinger/AudioPolicyService.cpp @@ -287,7 +287,7 @@ void AudioPolicyService::releaseOutput(audio_io_handle_t output) mpAudioPolicy->release_output(mpAudioPolicy, output); } -audio_io_handle_t AudioPolicyService::getInput(int inputSource, +audio_io_handle_t AudioPolicyService::getInput(audio_source_t inputSource, uint32_t samplingRate, audio_format_t format, uint32_t channels, @@ -297,6 +297,10 @@ audio_io_handle_t AudioPolicyService::getInput(int inputSource, if (mpAudioPolicy == NULL) { return 0; } + // already checked by client, but double-check in case the client wrapper is bypassed + if (uint32_t(inputSource) >= AUDIO_SOURCE_CNT) { + return 0; + } Mutex::Autolock _l(mLock); audio_io_handle_t input = mpAudioPolicy->get_input(mpAudioPolicy, inputSource, samplingRate, format, channels, acoustics); @@ -305,7 +309,7 @@ audio_io_handle_t AudioPolicyService::getInput(int inputSource, return input; } // create audio pre processors according to input source - ssize_t index = mInputSources.indexOfKey((audio_source_t)inputSource); + ssize_t index = mInputSources.indexOfKey(inputSource); if (index < 0) { return input; } diff --git a/services/audioflinger/AudioPolicyService.h b/services/audioflinger/AudioPolicyService.h index 9811670..3c0f5ed 100644 --- a/services/audioflinger/AudioPolicyService.h +++ b/services/audioflinger/AudioPolicyService.h @@ -74,7 +74,7 @@ public: audio_stream_type_t stream, int session = 0); virtual void releaseOutput(audio_io_handle_t output); - virtual audio_io_handle_t getInput(int inputSource, + virtual audio_io_handle_t getInput(audio_source_t inputSource, uint32_t samplingRate = 0, audio_format_t format = AUDIO_FORMAT_DEFAULT, uint32_t channels = 0, |