Switch OnMoreData() to use AudioBus.

media/audio/audio_output_controller.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_OUTPUT_CONTROLLER_H_
 #define MEDIA_AUDIO_AUDIO_OUTPUT_CONTROLLER_H_
 
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
@@ skipping 74 matching lines @@
   // synchronous reading.
   class SyncReader {
    public:
     virtual ~SyncReader() {}
 
     // Notify the synchronous reader the number of bytes in the
     // AudioOutputController not yet played. This is used by SyncReader to
     // prepare more data and perform synchronization.
     virtual void UpdatePendingBytes(uint32 bytes) = 0;
 
-    // Read certain amount of data into |data|. This method returns if some
-    // data is available.
-    virtual uint32 Read(void* data, uint32 size) = 0;
+    // Attempt to completely fill |audio_bus|, return the actual number of
+    // frames that could be read.
+    virtual int Read(AudioBus* audio_bus) = 0;
 
     // Close this synchronous reader.
     virtual void Close() = 0;
 
     // Poll if data is ready.
     // Not reliable, as there is no guarantee that renderer is "new-style"
     // renderer that writes metadata into buffer. After several unsuccessful
     // attempts caller should assume the data is ready even if that function
     // returns false.
     virtual bool DataReady() = 0;
@@ skipping 29 matching lines @@
   //
   // It is safe to call this method more than once. Calls after the first one
   // will have no effect.
   void Close(const base::Closure& closed_task);
 
   // Sets the volume of the audio output stream.
   void SetVolume(double volume);
 
   ///////////////////////////////////////////////////////////////////////////
   // AudioSourceCallback methods.
-  virtual uint32 OnMoreData(uint8* dest,
-                            uint32 max_size,
-                            AudioBuffersState buffers_state) OVERRIDE;
+  virtual int OnMoreData(AudioBus* audio_bus,
+                         AudioBuffersState buffers_state) OVERRIDE;
   virtual void OnError(AudioOutputStream* stream, int code) OVERRIDE;
   virtual void WaitTillDataReady() OVERRIDE;
 
  protected:
     // Internal state of the source.
   enum State {
     kEmpty,
     kCreated,
     kPlaying,
     kStarting,
     kPausedWhenStarting,
     kPaused,
     kClosed,
     kError,
   };
 
   friend class base::RefCountedThreadSafe<AudioOutputController>;
   virtual ~AudioOutputController();
 
  private:
   // We are polling sync reader if data became available.
   static const int kPollNumAttempts;
   static const int kPollPauseInMilliseconds;
 
   AudioOutputController(EventHandler* handler,
-                        SyncReader* sync_reader);
+                        SyncReader* sync_reader,
+                        const AudioParameters& params);
 
   // The following methods are executed on the audio manager thread.
-  void DoCreate(AudioManager* audio_manager, const AudioParameters& params);
+  void DoCreate(AudioManager* audio_manager);
   void DoPlay();
   void PollAndStartIfDataReady();
   void DoPause();
   void DoFlush();
   void DoClose();
   void DoSetVolume(double volume);
   void DoReportError(int code);
 
   // Helper method that starts physical stream.
   void StartStream();
@@ skipping 21 matching lines @@
   // SyncReader is used only in low latency mode for synchronous reading.
   SyncReader* sync_reader_;
 
   // The message loop of audio manager thread that this object runs on.
   scoped_refptr<base::MessageLoopProxy> message_loop_;
 
   // When starting stream we wait for data to become available.
   // Number of times left.
   int number_polling_attempts_left_;
 
+  AudioParameters params_;
+
   // Used to post delayed tasks to ourselves that we can cancel.
   // We don't want the tasks to hold onto a reference as it will slow down
   // shutdown and force it to wait for the most delayed task.
   // Also, if we're shutting down, we do not want to poll for more data.
   base::WeakPtrFactory<AudioOutputController> weak_this_;
 
   DISALLOW_COPY_AND_ASSIGN(AudioOutputController);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_AUDIO_AUDIO_OUTPUT_CONTROLLER_H_