Using native sampling rate and optimal buffer size for audio on Android.

media/audio/android/audio_manager_android.cc

Index: media/audio/android/audio_manager_android.cc
===================================================================
--- media/audio/android/audio_manager_android.cc	(revision 200561)
+++ media/audio/android/audio_manager_android.cc	(working copy)
@@ -56,13 +56,11 @@
 
 AudioParameters AudioManagerAndroid::GetInputStreamParameters(
     const std::string& device_id) {
-  // TODO(leozwang): Android defines the minimal buffer size requirment
-  // we should use it.
   static const int kDefaultBufferSize = 1024;
-  // TODO(xians): query the native channel layout for the specific device.
+  int size = GetMinInputBufferSize(GetNativeOutputSampleRate(), 2);
   return AudioParameters(
       AudioParameters::AUDIO_PCM_LOW_LATENCY, CHANNEL_LAYOUT_STEREO,
-      GetNativeOutputSampleRate(), 16, kDefaultBufferSize);
+      GetNativeOutputSampleRate(), 16, size <= 0 ? kDefaultBufferSize : size);
 }
 
 AudioOutputStream* AudioManagerAndroid::MakeAudioOutputStream(
@@ -119,15 +117,24 @@
   return new OpenSLESInputStream(this, params);
 }
 
+int AudioManagerAndroid::GetAudioOptimalOutputFrameSize(int sample_rate,
+                                                        int channels) {
+  if (IsAudioLowLatencySupported()) {
+    const int kTargetFrameSize = 2048;
+    int frame_size = GetAudioLowLatencyFrameSize();
+    // Return the optimal size as a multiple of the low latency frame
+    // size that is close to the target frame size.
+    return ((kTargetFrameSize + frame_size / 2) / frame_size) * frame_size;
+  } else
+    return GetMinOutputBufferSize(sample_rate, channels);
+}
+
 AudioParameters AudioManagerAndroid::GetPreferredOutputStreamParameters(
     const AudioParameters& input_params) {
-  // TODO(leozwang): Android defines the minimal buffer size requirment
-  // we should use it.
   static const int kDefaultBufferSize = 2048;
-
   ChannelLayout channel_layout = CHANNEL_LAYOUT_STEREO;
   int sample_rate = GetNativeOutputSampleRate();
-  int buffer_size = kDefaultBufferSize;
+  int buffer_size = GetAudioOptimalOutputFrameSize(sample_rate, 2);
   int bits_per_sample = 16;
   int input_channels = 0;
   if (input_params.IsValid()) {
@@ -136,8 +143,7 @@
     bits_per_sample = input_params.bits_per_sample();
     channel_layout = input_params.channel_layout();
     input_channels = input_params.input_channels();
-
-    buffer_size = std::min(buffer_size, input_params.frames_per_buffer());
+    buffer_size = buffer_size <= 0 ? kDefaultBufferSize : buffer_size;
   }
 
   int user_buffer_size = GetUserBufferSize();
@@ -178,4 +184,29 @@
       j_audio_manager_.obj());
 }
 
+int AudioManagerAndroid::GetMinInputBufferSize(int rate, int channels) {

[Raymond Toy (Google), 2013/05/16 19:30:01]

Should this be changed to return frames like GetMinOutputBufferSize
(GetMinOutputFrameSize) to be consistent?  I think the AudioParameter objects
work in frames.

[leozwang2, 2013/05/16 20:56:18]

Done.

+  return Java_AudioManagerAndroid_getMinInputBufSize(
+      base::android::AttachCurrentThread(),
+      rate, channels);
+}
+
+int AudioManagerAndroid::GetMinOutputBufferSize(int rate, int channels) {

[Raymond Toy (Google), 2013/05/16 19:30:01]

Should this be named GetMinOutputFrameSize instead of BufferSize, since we're
returning the number of frames?

[leozwang2, 2013/05/16 20:56:18]

Done.

+  int min_buffer_size_bytes = Java_AudioManagerAndroid_getMinOutputBufSize(
+      base::android::AttachCurrentThread(), rate, channels);
+  // Get buffer size in frames, assuming 16-bit pcm samples.
+  return min_buffer_size_bytes / channels / 2;
+}
+
+bool AudioManagerAndroid::IsAudioLowLatencySupported() {
+  return Java_AudioManagerAndroid_isAudioLowLatencySupported(
+      base::android::AttachCurrentThread(),
+      j_audio_manager_.obj());
+}
+
+int AudioManagerAndroid::GetAudioLowLatencyFrameSize() {
+  return Java_AudioManagerAndroid_getAudioLowLatencyFrameSize(
+      base::android::AttachCurrentThread(),
+      j_audio_manager_.obj());
+}
+
 }  // namespace media