Add OpenSL configurations

media/audio/android/opensles_output.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_output.h"
 
 #include "base/logging.h"
 #include "media/audio/audio_util.h"
 #include "media/audio/android/audio_manager_android.h"
 
@@ skipping 173 matching lines @@
   };
   SLDataSource audio_source = { &simple_buffer_queue, &format_ };
 
   // Audio sink configuration.
   SLDataLocator_OutputMix locator_output_mix = {
     SL_DATALOCATOR_OUTPUTMIX, output_mixer_.Get()
   };
   SLDataSink audio_sink = { &locator_output_mix, NULL };
 
   // Create an audio player.
-  const SLuint32 number_of_interfaces = 1;
+  const SLuint32 number_of_interfaces = 3;

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

could use arraysize() here.

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

Done.

   const SLInterfaceID interface_id[number_of_interfaces] = {
-    SL_IID_BUFFERQUEUE
+    SL_IID_BUFFERQUEUE,
+    SL_IID_VOLUME,
+    SL_IID_ANDROIDCONFIGURATION
   };
   const SLboolean interface_required[number_of_interfaces] = {
+    SL_BOOLEAN_TRUE,
+    SL_BOOLEAN_TRUE,
     SL_BOOLEAN_TRUE
   };
   err = (*engine)->CreateAudioPlayer(engine,
                                      player_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) << "CreateAudioPlayer() failed with error code " << err;
     return false;
   }
 
+  // CreateAudioPlayer and specify SL_IID_ANDROIDCONFIGURATION.

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

white space in CreateAudioPlayer

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

Done.

+  SLAndroidConfigurationItf player_config;
+  err = player_object_->GetInterface(player_object_.Get(),
+                                     SL_IID_ANDROIDCONFIGURATION,
+                                     &player_config);
+  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 thing for DCHECK vs if()

[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_STREAM_VOICE;
+  err = (*player_config)->SetConfiguration(player_config,
+                                           SL_ANDROID_KEY_STREAM_TYPE,
+                                           &stream_type, sizeof(SLint32));
+  DCHECK_EQ(SL_RESULT_SUCCESS, err);

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

ditto

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

Done.

+  if (SL_RESULT_SUCCESS != err)
+    return false;
+
   // Realize the player object in synchronous mode.
   err = player_object_->Realize(player_object_.Get(), SL_BOOLEAN_FALSE);
   DCHECK_EQ(SL_RESULT_SUCCESS, err);
   if (SL_RESULT_SUCCESS != err) {
     DLOG(ERROR) << "Player Realize() failed with error code " << err;
     return false;
   }
 
   // Get an implicit player interface.
   err = player_object_->GetInterface(
@@ skipping 80 matching lines @@
   }
 }
 
 void OpenSLESOutputStream::HandleError(SLresult error) {
   DLOG(ERROR) << "OpenSLES error " << error;
   if (callback_)
     callback_->OnError(this, error);
 }
 
 }  // namespace media