Switch OnMoreData() to use AudioBus.

media/audio/audio_io.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_IO_H_
 #define MEDIA_AUDIO_AUDIO_IO_H_
 
 #include "base/basictypes.h"
 #include "media/audio/audio_buffers_state.h"
+#include "media/base/audio_bus.h"
 
 // Low-level audio output support. To make sound there are 3 objects involved:
 // - AudioSource : produces audio samples on a pull model. Implements
 //   the AudioSourceCallback interface.
 // - AudioOutputStream : uses the AudioSource to render audio on a given
 //   channel, format and sample frequency configuration. Data from the
 //   AudioSource is delivered in a 'pull' model.
 // - AudioManager : factory for the AudioOutputStream objects, manager
 //   of the hardware resources and mixer control.
 //
@@ skipping 14 matching lines @@
 //
 // The primary client of this facility is audio coming from several tabs.
 // Specifically for this case we avoid supporting complex formats such as MP3
 // or WMA. Complex format decoding should be done by the renderers.
 
 
 // Models an audio stream that gets rendered to the audio hardware output.
 // Because we support more audio streams than physically available channels
 // a given AudioOutputStream might or might not talk directly to hardware.
 // An audio stream allocates several buffers for audio data and calls
-// AudioSourceCallback::OnModeData() periodically to fill these buffers,
+// AudioSourceCallback::OnMoreData() periodically to fill these buffers,
 // as the data is written to the audio device. Size of each packet is determined
 // by |samples_per_packet| specified in AudioParameters  when the stream is
 // created.
 
 namespace media {
 
 class MEDIA_EXPORT AudioOutputStream {
  public:
   // Audio sources must implement AudioSourceCallback. This interface will be
   // called in a random thread which very likely is a high priority thread. Do
   // not rely on using this thread TLS or make calls that alter the thread
   // itself such as creating Windows or initializing COM.
   class MEDIA_EXPORT AudioSourceCallback {
    public:
-    // Provide more data by filling |dest| up to |max_size| bytes. The provided
-    // buffer size is determined by the |samples_per_packet| specified in
-    // AudioParameters when the stream is created. The source will return
-    // the number of bytes it filled. The expected structure of |dest| is
-    // platform and format specific.
-    // |buffers_state| contains current state of the buffers, and can be used
-    // by the source to calculate delay.
-    virtual uint32 OnMoreData(uint8* dest,
-                              uint32 max_size,
-                              AudioBuffersState buffers_state) = 0;
+    // Provide more data by fully filling |audio_bus|.  The source will return
+    // the number of frames it filled.  |buffers_state| contains current state
+    // of the buffers, and can be used by the source to calculate delay.
+    virtual int OnMoreData(AudioBus* audio_bus,
+                           AudioBuffersState buffers_state) = 0;
 
     // There was an error while playing a buffer. Audio source cannot be
     // destroyed yet. No direct action needed by the AudioStream, but it is
     // a good place to stop accumulating sound data since is is likely that
     // playback will not continue. |code| is an error code that is platform
     // specific.
     virtual void OnError(AudioOutputStream* stream, int code) = 0;
 
     // Waits till data becomes available. Used when buffering data starting
     // new audio stream.
@@ skipping 95 matching lines @@
   // Sets the Automatic Gain Control (AGC) state.
   virtual void SetAutomaticGainControl(bool enabled) = 0;
 
   // Returns the Automatic Gain Control (AGC) state.
   virtual bool GetAutomaticGainControl() = 0;
 };
 
 }  // namespace media
 
 #endif  // MEDIA_AUDIO_AUDIO_IO_H_