Switch AudioRenderSink::Callback to use AudioBus.

media/audio/audio_input_device.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/audio_input_device.h"
 
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/time.h"
 #include "media/audio/audio_manager_base.h"
 #include "media/audio/audio_util.h"
+#include "media/base/audio_bus.h"
 
 namespace media {
 
 AudioInputDevice::CaptureCallback::~CaptureCallback() {}
 AudioInputDevice::CaptureEventHandler::~CaptureEventHandler() {}
 
 // Takes care of invoking the capture callback on the audio thread.
 // An instance of this class is created for each capture stream in
 // OnLowLatencyCreated().
 class AudioInputDevice::AudioThreadCallback
@@ skipping 298 matching lines @@
   // actual data buffer containing audio data. Map the memory into this
   // structure and parse out parameters and the data area.
   AudioInputBuffer* buffer =
       reinterpret_cast<AudioInputBuffer*>(shared_memory_.memory());
   DCHECK_EQ(buffer->params.size,
             memory_length_ - sizeof(AudioInputBufferParameters));
   double volume = buffer->params.volume;
 
   int audio_delay_milliseconds = pending_data / bytes_per_ms_;
   int16* memory = reinterpret_cast<int16*>(&buffer->audio[0]);
-  const size_t number_of_frames = audio_parameters_.frames_per_buffer();
   const int bytes_per_sample = sizeof(memory[0]);
 
   // Deinterleave each channel and convert to 32-bit floating-point
   // with nominal range -1.0 -> +1.0.
-  for (int channel_index = 0; channel_index < audio_parameters_.channels();
+  for (int channel_index = 0; channel_index < audio_bus_->channels();
        ++channel_index) {
     DeinterleaveAudioChannel(memory,
-                             audio_data_[channel_index],
-                             audio_parameters_.channels(),
+                             audio_bus_->channel(channel_index),
+                             audio_bus_->channels(),
                              channel_index,
                              bytes_per_sample,
-                             number_of_frames);
+                             audio_bus_->frames());
   }
 
   // Deliver captured data to the client in floating point format
   // and update the audio-delay measurement.
-  capture_callback_->Capture(audio_data_, number_of_frames,
+  capture_callback_->Capture(audio_bus_.get(), audio_bus_->frames(),
                              audio_delay_milliseconds, volume);
 }
 
 }  // namespace media