Add OpenSL configurations

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 175 matching lines @@
   SLDataSource audio_source = { &mic_locator, NULL };
 
   // Audio sink configuration.
   SLDataLocator_AndroidSimpleBufferQueue buffer_queue = {
     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 SLuint32 number_of_interfaces = 2;

[tommi (sloooow) - chröme, 2013/03/21 14:56:44]

what about:
const SLInterfaceID interface_id[] = {
  SL_IID_ANDROIDSIMPLEBUFFERQUEUE,
  SL_IID_ANDROIDCONFIGURATION
};

const SLuint32 number_of_interfaces = arraysize(interface_id);

[leozwang1, 2013/03/21 15:33:35]

Done.

   const SLInterfaceID interface_id[number_of_interfaces] = {
-    SL_IID_ANDROIDSIMPLEBUFFERQUEUE
+    SL_IID_ANDROIDSIMPLEBUFFERQUEUE,
+    SL_IID_ANDROIDCONFIGURATION
   };
   const SLboolean interface_required[number_of_interfaces] = {
+    SL_BOOLEAN_TRUE,
     SL_BOOLEAN_TRUE
   };
   err = (*engine)->CreateAudioRecorder(engine,
                                        recorder_object_.Receive(),
                                        &audio_source,
                                        &audio_sink,
                                        number_of_interfaces,
                                        interface_id,
                                        interface_required);
   DCHECK_EQ(SL_RESULT_SUCCESS, err);
   if (SL_RESULT_SUCCESS != err) {
     DLOG(ERROR) << "CreateAudioRecorder failed with error code " << err;
     return false;
   }
 
+  // CreateAudioRecorder and specify SL_IID_ANDROIDCONFIGURATION.

[qinmin, 2013/03/21 14:56:19]

create AudioRecorder

[leozwang1, 2013/03/21 15:33:35]

Done.

+  SLAndroidConfigurationItf recorder_config;
+  err = recorder_object_->GetInterface(recorder_object_.Get(),
+                                       SL_IID_ANDROIDCONFIGURATION,
+                                       &recorder_config);
+  DCHECK_EQ(SL_RESULT_SUCCESS, err);

[qinmin, 2013/03/21 14:56:19]

the DCHECK seems redundant with the if statement below

[tommi (sloooow) - chröme, 2013/03/21 14:56:44]

This DCHECK and the if() that follows are contradictory according to how we use
DCHECK in chrome code.  The DCHECK means that this should never happen.  If
that's true, then you don't need the if().
If on the other hand you think this could happen, then log an error instead.
Something like:

if (err != SL_RESULT_SUCCESS) {
  DLOG(ERROR) << "GetInterface(SL_IID_ANDROIDCONFIGURATION): " << err;
  return false;
}

[leozwang1, 2013/03/21 15:33:35]

Done.

[leozwang1, 2013/03/21 15:33:35]

Done.

+  if (SL_RESULT_SUCCESS != err)
+    return false;
+
+  SLint32 stream_type = SL_ANDROID_RECORDING_PRESET_VOICE_COMMUNICATION;
+  err = (*recorder_config)->SetConfiguration(
+      recorder_config,
+      SL_ANDROID_KEY_RECORDING_PRESET,
+      &stream_type, sizeof(SLint32));
+  DCHECK_EQ(SL_RESULT_SUCCESS, err);

[qinmin, 2013/03/21 14:56:19]

ditto

[tommi (sloooow) - chröme, 2013/03/21 14:56:44]

same here.

[leozwang1, 2013/03/21 15:33:35]

Done.

[leozwang1, 2013/03/21 15:33:35]

Done.

+  if (SL_RESULT_SUCCESS != err)
+    return false;
+
   // Realize the recorder object in synchronous mode.
   err = recorder_object_->Realize(recorder_object_.Get(), SL_BOOLEAN_FALSE);
   DCHECK_EQ(SL_RESULT_SUCCESS, err);

[tommi (sloooow) - chröme, 2013/03/21 14:56:44]

can you fix these (and below) as well?

[leozwang1, 2013/03/21 15:33:35]

Done.

   if (SL_RESULT_SUCCESS != err) {
     DLOG(ERROR) << "Recprder Realize() failed with error code " << err;
     return false;
   }
 
   // Get an implicit recorder interface.
   err = recorder_object_->GetInterface(recorder_object_.Get(),
                                        SL_IID_RECORD,
                                        &recorder_);
   DCHECK_EQ(SL_RESULT_SUCCESS, err);
@@ skipping 63 matching lines @@
   }
 }
 
 void OpenSLESInputStream::HandleError(SLresult error) {
   DLOG(FATAL) << "OpenSLES error " << error;
   if (callback_)
     callback_->OnError(this, error);
 }
 
 }  // namespace media