Collapse AudioRendererMixer and OnMoreDataResampler into AudioTransform.

media/base/audio_renderer_mixer_input.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_BASE_AUDIO_RENDERER_MIXER_INPUT_H_
 #define MEDIA_BASE_AUDIO_RENDERER_MIXER_INPUT_H_
 
 #include <vector>
 
 #include "base/callback.h"
 #include "media/base/audio_renderer_sink.h"
+#include "media/base/audio_transform.h"
 
 namespace media {
 
 class AudioRendererMixer;
 
 class MEDIA_EXPORT AudioRendererMixerInput
-    : NON_EXPORTED_BASE(public AudioRendererSink) {
+    : NON_EXPORTED_BASE(public AudioRendererSink),
+      public AudioTransform::AudioTransformInput {
  public:
   typedef base::Callback<AudioRendererMixer*(
       const AudioParameters& params)> GetMixerCB;
   typedef base::Callback<void(const AudioParameters& params)> RemoveMixerCB;
 
   AudioRendererMixerInput(
       const GetMixerCB& get_mixer_cb, const RemoveMixerCB& remove_mixer_cb);
 
-  AudioRendererSink::RenderCallback* callback() { return callback_; }
-  bool playing() { return playing_; }
-
   // AudioRendererSink implementation.
   virtual void Start() OVERRIDE;
   virtual void Stop() OVERRIDE;
   virtual void Play() OVERRIDE;
   virtual void Pause(bool flush) OVERRIDE;
   virtual bool SetVolume(double volume) OVERRIDE;
   virtual void Initialize(const AudioParameters& params,
                           AudioRendererSink::RenderCallback* renderer) OVERRIDE;
 
-  void GetVolume(double* volume);
+  // Called by AudioRendererMixer when new delay information is available.
+  void set_audio_delay_milliseconds(int audio_delay_milliseconds) {
+    current_audio_delay_milliseconds_ = audio_delay_milliseconds;
+  }
+
+  // Called by AudioRendererMixer when an error occurs.
+  void OnRenderError();
 
  protected:
   virtual ~AudioRendererMixerInput();
 
  private:
+  friend class AudioRendererMixerInputTest;
+
   bool playing_;
   bool initialized_;
   bool started_;
   double volume_;
 
+  // AudioTransform::ProvideAudioTransformInput implementation.
+  virtual float ProvideAudioTransformInput(
+      AudioBus* audio_bus, base::TimeDelta buffer_delay) OVERRIDE;
+
   // Callbacks provided during construction which allow AudioRendererMixerInput
   // to retrieve a mixer during Initialize() and notify when it's done with it.
   GetMixerCB get_mixer_cb_;
   RemoveMixerCB remove_mixer_cb_;
 
   // AudioParameters received during Initialize().
   AudioParameters params_;
 
   // AudioRendererMixer provided through |get_mixer_cb_| during Initialize(),
   // guaranteed to live (at least) until |remove_mixer_cb_| is called.
   AudioRendererMixer* mixer_;
 
   // Source of audio data which is provided to the mixer.
   AudioRendererSink::RenderCallback* callback_;
 
+  // The current audio delay as last provided by AudioRendererMixer.  Updated on
+  // each ProvideInput() call using |ms_per_frame_|.
+  int current_audio_delay_milliseconds_;
+
   DISALLOW_COPY_AND_ASSIGN(AudioRendererMixerInput);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_AUDIO_RENDERER_MIXER_INPUT_H_