diff options
| author | Glenn Kasten <gkasten@google.com> | 2012-07-02 13:12:31 -0700 |
|---|---|---|
| committer | Glenn Kasten <gkasten@google.com> | 2012-07-03 08:40:46 -0700 |
| commit | 845b4712f0e4d7ca802f21fba1adae0b1d0712e7 (patch) | |
| tree | 6cf0b91634cf8de5dd5a85dac160937a7a436aa1 | |
| parent | c8d5f7d607123966651b2bc521ba9c4470952b34 (diff) | |
| download | frameworks_base-845b4712f0e4d7ca802f21fba1adae0b1d0712e7.zip frameworks_base-845b4712f0e4d7ca802f21fba1adae0b1d0712e7.tar.gz frameworks_base-845b4712f0e4d7ca802f21fba1adae0b1d0712e7.tar.bz2 | |
Use audio_channel_mask_t more consistently
In AudioRecord::getMinFrameCount() and AudioSystem::getInputBufferSize(),
input parameter is channel mask instead of channel count.
Change-Id: I22a1c492113f3e689173c5ab97b2567cff3abe2b
| -rw-r--r-- | core/jni/android_media_AudioRecord.cpp | 2 | ||||
| -rw-r--r-- | voip/jni/rtp/AudioGroup.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/jni/android_media_AudioRecord.cpp b/core/jni/android_media_AudioRecord.cpp index a5a2add..c76cb64 100644 --- a/core/jni/android_media_AudioRecord.cpp +++ b/core/jni/android_media_AudioRecord.cpp @@ -516,7 +516,7 @@ static jint android_media_AudioRecord_get_min_buff_size(JNIEnv *env, jobject th sampleRateInHertz, (audioFormat == javaAudioRecordFields.PCM16 ? AUDIO_FORMAT_PCM_16_BIT : AUDIO_FORMAT_PCM_8_BIT), - nbChannels); + audio_channel_in_mask_from_count(nbChannels)); if (result == BAD_VALUE) { return 0; diff --git a/voip/jni/rtp/AudioGroup.cpp b/voip/jni/rtp/AudioGroup.cpp index 673a650..1579e6a 100644 --- a/voip/jni/rtp/AudioGroup.cpp +++ b/voip/jni/rtp/AudioGroup.cpp @@ -790,7 +790,7 @@ bool AudioGroup::DeviceThread::threadLoop() if (AudioTrack::getMinFrameCount(&output, AUDIO_STREAM_VOICE_CALL, sampleRate) != NO_ERROR || output <= 0 || AudioRecord::getMinFrameCount(&input, sampleRate, - AUDIO_FORMAT_PCM_16_BIT, 1) != NO_ERROR || input <= 0) { + AUDIO_FORMAT_PCM_16_BIT, AUDIO_CHANNEL_IN_MONO) != NO_ERROR || input <= 0) { ALOGE("cannot compute frame count"); return false; } |