diff options
author | Glenn Kasten <gkasten@google.com> | 2014-01-08 08:58:53 -0800 |
---|---|---|
committer | Glenn Kasten <gkasten@google.com> | 2014-01-08 10:05:05 -0800 |
commit | 5446e541367061b53f45f3fd4600f9060680bca3 (patch) | |
tree | aab5a964fa730bc79bad87c2904177019e856827 /media/libmedia | |
parent | 4d973f3894a50413f21e7db284e96afc87f57698 (diff) | |
download | frameworks_av-5446e541367061b53f45f3fd4600f9060680bca3.zip frameworks_av-5446e541367061b53f45f3fd4600f9060680bca3.tar.gz frameworks_av-5446e541367061b53f45f3fd4600f9060680bca3.tar.bz2 |
Cleanup AudioSystem::getInputBufferSize error handling and caching
Previously, if the IAudioFlinger::getInputBufferSize failed,
it would return NO_ERROR but a zero buffer size value, which could
confuse the caller. Now it returns BAD_VALUE in this case.
Also it would still cache the zero buffer size. Now it does
not cache on failure.
Removed over-initialization of the cache globals.
Change-Id: I6835fcb56fe52535e018fc8c0c242115221b5d85
Diffstat (limited to 'media/libmedia')
-rw-r--r-- | media/libmedia/AudioSystem.cpp | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/media/libmedia/AudioSystem.cpp b/media/libmedia/AudioSystem.cpp index 9a76111..de3beb5 100644 --- a/media/libmedia/AudioSystem.cpp +++ b/media/libmedia/AudioSystem.cpp @@ -40,10 +40,10 @@ audio_error_callback AudioSystem::gAudioErrorCallback = NULL; DefaultKeyedVector<audio_io_handle_t, AudioSystem::OutputDescriptor *> AudioSystem::gOutputs(0); // Cached values for recording queries, all protected by gLock -uint32_t AudioSystem::gPrevInSamplingRate = 16000; -audio_format_t AudioSystem::gPrevInFormat = AUDIO_FORMAT_PCM_16_BIT; -audio_channel_mask_t AudioSystem::gPrevInChannelMask = AUDIO_CHANNEL_IN_MONO; -size_t AudioSystem::gInBuffSize = 0; +uint32_t AudioSystem::gPrevInSamplingRate; +audio_format_t AudioSystem::gPrevInFormat; +audio_channel_mask_t AudioSystem::gPrevInChannelMask; +size_t AudioSystem::gInBuffSize = 0; // zero indicates cache is invalid // establish binder interface to AudioFlinger service @@ -359,6 +359,12 @@ status_t AudioSystem::getInputBufferSize(uint32_t sampleRate, audio_format_t for return PERMISSION_DENIED; } inBuffSize = af->getInputBufferSize(sampleRate, format, channelMask); + if (inBuffSize == 0) { + ALOGE("AudioSystem::getInputBufferSize failed sampleRate %d format %x channelMask %x", + sampleRate, format, channelMask); + return BAD_VALUE; + } + // A benign race is possible here: we could overwrite a fresher cache entry gLock.lock(); // save the request params gPrevInSamplingRate = sampleRate; |