Modifies AudioInputCallback::OnData and use media::AudioBus instead of plain byte vector

media/audio/audio_input_controller.cc

Index: media/audio/audio_input_controller.cc
diff --git a/media/audio/audio_input_controller.cc b/media/audio/audio_input_controller.cc
index e74b0a1e75de74f710294c1b334e5d142ba6c835..58a23c4b20d5a39eb4fafa0b0bf46b008e4ecd43 100644
--- a/media/audio/audio_input_controller.cc
+++ b/media/audio/audio_input_controller.cc
@@ -202,7 +202,6 @@ void AudioInputController::DoCreate(AudioManager* audio_manager,
   audio_level_.reset(new media::AudioPowerMonitor(
       params.sample_rate(),
       TimeDelta::FromMilliseconds(kPowerMeasurementTimeConstantMilliseconds)));
-  audio_bus_ = AudioBus::Create(params);
   audio_params_ = params;
 #endif
 
@@ -383,8 +382,7 @@ void AudioInputController::DoCheckForNoData() {
 }
 
 void AudioInputController::OnData(AudioInputStream* stream,
-                                  const uint8* data,
-                                  uint32 size,
+                                  const AudioBus* source,
                                   uint32 hardware_delay_bytes,
                                   double volume) {
   // Mark data as active to ensure that the periodic calls to
@@ -408,7 +406,7 @@ void AudioInputController::OnData(AudioInputStream* stream,
   // Use SharedMemory and SyncSocket if the client has created a SyncWriter.
   // Used by all low-latency clients except WebSpeech.
   if (SharedMemoryAndSyncSocketMode()) {
-    sync_writer_->Write(data, size, volume, key_pressed);
+    sync_writer_->Write(source, volume, key_pressed);
     sync_writer_->UpdateRecordedBytes(hardware_delay_bytes);
 
 #if defined(AUDIO_POWER_MONITORING)
@@ -424,9 +422,7 @@ void AudioInputController::OnData(AudioInputStream* stream,
       // Wrap data into an AudioBus to match AudioPowerMonitor::Scan.
       // TODO(henrika): remove this section when capture side uses AudioBus.
       // See http://crbug.com/375155 for details.
-      audio_bus_->FromInterleaved(
-          data, audio_bus_->frames(), audio_params_.bits_per_sample() / 8);
-      audio_level_->Scan(*audio_bus_, audio_bus_->frames());
+      audio_level_->Scan(*source, source->frames());
 
       // Get current average power level and add it to the log.
       // Possible range is given by [-inf, 0] dBFS.
@@ -449,6 +445,10 @@ void AudioInputController::OnData(AudioInputStream* stream,
     return;
   }
 
+  // TODO(henrika): fix WebSpeech as well....

[no longer working on chromium, 2014/06/04 12:38:13]

looks like you need to fix it to land this CL.

[henrika (OOO until Aug 14), 2014/06/04 13:52:33]

Yes. I just want the core stuff to be OK first.

+
+  /*
+
   // TODO(henrika): Investigate if we can avoid the extra copy here.
   // (see http://crbug.com/249316 for details). AFAIK, this scope is only
   // active for WebSpeech clients.
@@ -459,6 +459,7 @@ void AudioInputController::OnData(AudioInputStream* stream,
   // when ownership is passed to the callback function.
   task_runner_->PostTask(FROM_HERE, base::Bind(
       &AudioInputController::DoOnData, this, base::Passed(&audio_data), size));
+  */
 }
 
 void AudioInputController::DoOnData(scoped_ptr<uint8[]> data, uint32 size) {