Switch AudioRenderSink::Callback to use AudioBus.

media/audio/audio_device_thread.h

 // 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.
 
 #ifndef MEDIA_AUDIO_AUDIO_DEVICE_THREAD_H_
 #define MEDIA_AUDIO_AUDIO_DEVICE_THREAD_H_
 
-#include <vector>
-
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
+#include "base/memory/scoped_ptr.h"
 #include "base/shared_memory.h"
 #include "base/sync_socket.h"
 #include "base/synchronization/lock.h"
 #include "media/base/media_export.h"
 #include "media/audio/audio_parameters.h"
 
 class MessageLoop;
 
 namespace media {
+class AudioBus;
 
 // Data transfer between browser and render process uses a combination
 // of sync sockets and shared memory. To read from the socket and render
 // data, we use a worker thread, a.k.a. the AudioDeviceThread, which reads
 // data from the browser via the socket and fills the shared memory from the
 // audio thread via the AudioDeviceThread::Callback interface/class.
 // For more details see the documentation in audio_device.h.
 //
 // TODO(tommi): Multiple audio input/output device instances should be able to
 // share the same thread instead of spinning one per instance.
@@ skipping 22 matching lines @@
    protected:
     // Protected so that derived classes can access directly.
     // The variables are 'const' since values are calculated/set in the
     // constructor and must never change.
     const AudioParameters audio_parameters_;
     const int samples_per_ms_;
     const int bytes_per_ms_;
 
     // Audio buffers that are allocated in InitializeOnAudioThread() based on
     // info from audio_parameters_.
-    std::vector<float*> audio_data_;
+    scoped_ptr<AudioBus> audio_bus_;
     base::SharedMemory shared_memory_;
     const int memory_length_;
 
    private:
     DISALLOW_COPY_AND_ASSIGN(Callback);
   };
 
   AudioDeviceThread();
   ~AudioDeviceThread();
 
@@ skipping 28 matching lines @@
 
   base::Lock thread_lock_;
   scoped_refptr<AudioDeviceThread::Thread> thread_;
 
   DISALLOW_COPY_AND_ASSIGN(AudioDeviceThread);
 };
 
 }  // namespace media.
 
 #endif  // MEDIA_AUDIO_AUDIO_DEVICE_THREAD_H_