diff options
| author | Glenn Kasten <gkasten@google.com> | 2014-02-25 19:34:25 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-02-25 19:34:25 +0000 |
| commit | 99ef241a8d310b3319c02eac18de9bb7422c5ab0 (patch) | |
| tree | 5d1627543262c8bfd0e9f1fa88da8ee50d2f48cc /media/libmedia/AudioRecord.cpp | |
| parent | 9f474b7824abb0d5408d02e365cf37a986663979 (diff) | |
| parent | c85df82b1e8b05714268926a8bb3deb9c65f9a22 (diff) | |
| download | frameworks_av-99ef241a8d310b3319c02eac18de9bb7422c5ab0.zip frameworks_av-99ef241a8d310b3319c02eac18de9bb7422c5ab0.tar.gz frameworks_av-99ef241a8d310b3319c02eac18de9bb7422c5ab0.tar.bz2 | |
Merge "Permit AudioRecord to support non-linear formats in future"
Diffstat (limited to 'media/libmedia/AudioRecord.cpp')
| -rw-r--r-- | media/libmedia/AudioRecord.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/media/libmedia/AudioRecord.cpp b/media/libmedia/AudioRecord.cpp index eaa52ca..ce35c31 100644 --- a/media/libmedia/AudioRecord.cpp +++ b/media/libmedia/AudioRecord.cpp @@ -203,8 +203,11 @@ status_t AudioRecord::set( uint32_t channelCount = popcount(channelMask); mChannelCount = channelCount; - // Assumes audio_is_linear_pcm(format), else sizeof(uint8_t) - mFrameSize = channelCount * audio_bytes_per_sample(format); + if (audio_is_linear_pcm(format)) { + mFrameSize = channelCount * audio_bytes_per_sample(format); + } else { + mFrameSize = sizeof(uint8_t); + } // validate framecount size_t minFrameCount; |