Fix audio capture buffer handling on Android.

media/audio/android/opensles_input.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/audio/android/opensles_input.h"
 
 #include "base/logging.h"
 #include "media/audio/android/audio_manager_android.h"
 
 namespace media {
@@ skipping 53 matching lines @@
   if (started_)
     return;
 
   // Enable the flags before streaming.
   callback_ = callback;
   active_queue_ = 0;
   started_ = true;
 
   SLresult err = SL_RESULT_UNKNOWN_ERROR;
   // Enqueues |kNumOfQueuesInBuffer| zero buffers to get the ball rolling.
-  for (int i = 0; i < kNumOfQueuesInBuffer - 1; ++i) {
+  for (int i = 0; i < kNumOfQueuesInBuffer; ++i) {
     err = (*simple_buffer_queue_)->Enqueue(
         simple_buffer_queue_,
         audio_data_[i],
         buffer_size_bytes_);
     if (SL_RESULT_SUCCESS != err) {
       HandleError(err);
       return;
     }
   }
 
@@ skipping 95 matching lines @@
 
   // Audio source configuration.
   SLDataLocator_IODevice mic_locator = {
     SL_DATALOCATOR_IODEVICE, SL_IODEVICE_AUDIOINPUT,
     SL_DEFAULTDEVICEID_AUDIOINPUT, NULL
   };
   SLDataSource audio_source = { &mic_locator, NULL };
 
   // Audio sink configuration.
   SLDataLocator_AndroidSimpleBufferQueue buffer_queue = {
-    SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, // Locator type.
+    SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE,  // Locator type.
     static_cast<SLuint32>(kNumOfQueuesInBuffer)  // Number of buffers.
   };
   SLDataSink audio_sink = { &buffer_queue, &format_ };
 
   // Create an audio recorder.
   const SLuint32 number_of_interfaces = 1;
   const SLInterfaceID interface_id[number_of_interfaces] = {
     SL_IID_ANDROIDSIMPLEBUFFERQUEUE
   };
   const SLboolean interface_required[number_of_interfaces] = {
@@ skipping 50 matching lines @@
     SLAndroidSimpleBufferQueueItf buffer_queue, void* instance) {
   OpenSLESInputStream* stream =
       reinterpret_cast<OpenSLESInputStream*>(instance);
   stream->ReadBufferQueue();
 }
 
 void OpenSLESInputStream::ReadBufferQueue() {
   if (!started_)
     return;
 
-  // Get the enqueued buffer from the soundcard.
+  // TODO(xians): Get an accurate delay estimation.
+  callback_->OnData(this,
+                    audio_data_[active_queue_],
+                    buffer_size_bytes_,
+                    buffer_size_bytes_,
+                    0.0);
+
+  // Done with this buffer. Send it to device for recording.
   SLresult err = (*simple_buffer_queue_)->Enqueue(
       simple_buffer_queue_,
       audio_data_[active_queue_],
       buffer_size_bytes_);
   if (SL_RESULT_SUCCESS != err)
     HandleError(err);
 
-  // TODO(xians): Get an accurate delay estimation.
-  callback_->OnData(this,
-                    audio_data_[active_queue_],
-                    buffer_size_bytes_,
-                    buffer_size_bytes_,
-                    0.0);
-
   active_queue_ = (active_queue_ + 1) % kNumOfQueuesInBuffer;
 }
 
 void OpenSLESInputStream::SetupAudioBuffer() {
   DCHECK(!audio_data_[0]);
   for (int i = 0; i < kNumOfQueuesInBuffer; ++i) {
     audio_data_[i] = new uint8[buffer_size_bytes_];
   }
 }
 
 void OpenSLESInputStream::ReleaseAudioBuffer() {
   if (audio_data_[0]) {
     for (int i = 0; i < kNumOfQueuesInBuffer; ++i) {
       delete [] audio_data_[i];
       audio_data_[i] = NULL;
     }
   }
 }
 
 void OpenSLESInputStream::HandleError(SLresult error) {
   DLOG(FATAL) << "OpenSLES error " << error;
   if (callback_)
     callback_->OnError(this);
 }
 
 }  // namespace media