Switch AudioRenderSink::Callback to use AudioBus.

media/audio/audio_device_thread.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_device_thread.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/memory/aligned_memory.h"
 #include "base/message_loop.h"
 #include "base/threading/platform_thread.h"
 #include "base/threading/thread_restrictions.h"
 #include "media/audio/audio_util.h"
+#include "media/base/audio_bus.h"
 
 using base::PlatformThread;
 
 namespace media {
 
 // The actual worker thread implementation.  It's very bare bones and much
 // simpler than SimpleThread (no synchronization in Start, etc) and supports
 // joining the thread handle asynchronously via a provided message loop even
 // after the Thread object itself has been deleted.
 class AudioDeviceThread::Thread
@@ skipping 155 matching lines @@
       samples_per_ms_(audio_parameters.sample_rate() / 1000),
       bytes_per_ms_(audio_parameters.channels() *
                     (audio_parameters_.bits_per_sample() / 8) *
                     samples_per_ms_),
       shared_memory_(memory, false),
       memory_length_(memory_length) {
   CHECK_NE(bytes_per_ms_, 0);  // Catch division by zero early.
   CHECK_NE(samples_per_ms_, 0);
 }
 
-AudioDeviceThread::Callback::~Callback() {
-  for (size_t i = 0; i < audio_data_.size(); ++i)
-    base::AlignedFree(audio_data_[i]);
-}
+AudioDeviceThread::Callback::~Callback() {}
 
 void AudioDeviceThread::Callback::InitializeOnAudioThread() {
-  DCHECK(audio_data_.empty());
+  DCHECK(!audio_bus_.get());
 
   MapSharedMemory();
   DCHECK(shared_memory_.memory() != NULL);
 
-  // Allocate buffer with a 16-byte alignment to allow SSE optimizations.
-  audio_data_.reserve(audio_parameters_.channels());
-  for (int i = 0; i < audio_parameters_.channels(); ++i) {
-    audio_data_.push_back(static_cast<float*>(base::AlignedAlloc(
-        sizeof(float) * audio_parameters_.frames_per_buffer(), 16)));
-  }
+  audio_bus_ = AudioBus::Create(audio_parameters_);

[DaleCurtis, 2012/08/07 23:12:19]

Coming back to my Q on the other CL, if we wrapped the shared memory here
instead of creating a new AudioBus, we can drop the memcpy that will replace
InterleaveFloatToInt() in AudioOutputDevice.

[scherkus (not reviewing), 2012/08/08 00:49:01]

That seems like a worthwhile TODO / follow-up CL -- avoiding copies are a nice
win as long as it doesn't horribly complicate things

[DaleCurtis, 2012/08/08 01:26:07]

Should be relatively simple. I'll add a TODO.

 }
 
 }  // namespace media.