commit 18d523fa3e2b6bdc341d3cb9042092ff2c0d9ad2
author Jean-Baptiste Queru <jbq@google.com> Thu Sep 06 11:51:53 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Sep 06 11:51:53 2012 -0700
tree 2e5cb4c26121ba2658ab62fe4cf6bdbe4263dbe2
parent f29ac10f0f3649c16a6e44bac961401cd3874fd4
parent 0226eb00cecf82b53e29758c04cd1b39015d2909

am f66603e1: am 3f3ce8ad: am bf3e62b8: Merge "Make SimpleSessionDescription locale safe"

* commit 'f66603e109d439e3a537cd3804706609ce86970e':
  Make SimpleSessionDescription locale safe

jni/rtp/AudioGroup.cpp

diff --git a/jni/rtp/AudioGroup.cpp b/jni/rtp/AudioGroup.cpp
index 673a650..1579e6a 100644
--- a/jni/rtp/AudioGroup.cpp
+++ b/jni/rtp/AudioGroup.cpp
@@ -790,7 +790,7 @@
     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;
     }