Switch OnMoreData() to use AudioBus.

content/browser/renderer_host/media/audio_sync_reader.h

Index: content/browser/renderer_host/media/audio_sync_reader.h
diff --git a/content/browser/renderer_host/media/audio_sync_reader.h b/content/browser/renderer_host/media/audio_sync_reader.h
index eec238c1f15e70058bed60e03875dcaac2251833..c1f25fa4b7d2da35231d5263ec6f35357b8ad8bc 100644
--- a/content/browser/renderer_host/media/audio_sync_reader.h
+++ b/content/browser/renderer_host/media/audio_sync_reader.h
@@ -11,6 +11,7 @@
 #include "base/synchronization/lock.h"
 #include "base/time.h"
 #include "media/audio/audio_output_controller.h"
+#include "media/base/audio_bus.h"
 
 namespace base {
 class SharedMemory;
@@ -22,13 +23,14 @@ class SharedMemory;
 // process.
 class AudioSyncReader : public media::AudioOutputController::SyncReader {
  public:
-  explicit AudioSyncReader(base::SharedMemory* shared_memory);
+  AudioSyncReader(base::SharedMemory* shared_memory,
+                  const media::AudioParameters& params);
 
   virtual ~AudioSyncReader();
 
   // media::AudioOutputController::SyncReader implementations.
   virtual void UpdatePendingBytes(uint32 bytes) OVERRIDE;
-  virtual uint32 Read(void* data, uint32 size) OVERRIDE;
+  virtual int Read(media::AudioBus* audio_bus) OVERRIDE;

[Chris Rogers, 2012/08/24 20:20:26]

Please add comment for Read() explaining the meaning of the return value (it now
returns frames instead of bytes).

[DaleCurtis, 2012/08/24 23:53:12]

That's done in AudioOutputController::SyncReader.

   virtual void Close() OVERRIDE;
   virtual bool DataReady() OVERRIDE;
 
@@ -51,6 +53,12 @@ class AudioSyncReader : public media::AudioOutputController::SyncReader {
   // PrepareForeignSocketHandle() is called and ran successfully.
   scoped_ptr<base::CancelableSyncSocket> foreign_socket_;
 
+  // Shared memory wrapper used for transfering audio data to Read() callers.
+  scoped_ptr<media::AudioBus> audio_bus_;
+
+  // Maximum amount of audio data which can be transferred in one Read() call.
+  int packet_size_;

[Chris Rogers, 2012/08/24 20:20:26]

It would be nice to get away from the word "packet" which is usually used more
on the codec end and call this something like "max_buffer_size_"

[DaleCurtis, 2012/08/24 23:53:12]

I'll put out another CL for this since there's a whole CL worth of terminology
clean up in audio_util (now shared_memory_util) to get everyone using the
correct terms.  As it is shared_memory_util uses packet_size and
shared_memory_size interchangeably and has an overloaded
"shared_memory_created_size".

Then I'll rename this once we agree on terms in that CL.

+
   DISALLOW_COPY_AND_ASSIGN(AudioSyncReader);
 };