Move AudioRenderer out of Filter heirarchy.

media/filters/audio_renderer_impl.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.
 
 // Audio rendering unit utilizing an AudioRendererSink to output data.
 //
 // This class lives inside three threads during it's lifetime, namely:
 // 1. Render thread.
 //    This object is created on the render thread.
 // 2. Pipeline thread
@@ skipping 22 matching lines @@
 
 class MEDIA_EXPORT AudioRendererImpl
     : public AudioRenderer,
       NON_EXPORTED_BASE(public media::AudioRendererSink::RenderCallback) {
  public:
   // Methods called on Render thread ------------------------------------------
   // An AudioRendererSink is used as the destination for the rendered audio.
   explicit AudioRendererImpl(media::AudioRendererSink* sink);
 
   // Methods called on pipeline thread ----------------------------------------
-  // Filter implementation.
-  virtual void SetHost(FilterHost* host) OVERRIDE;
+  // AudioRenderer implementation.
+  virtual void Initialize(const scoped_refptr<AudioDecoder>& decoder,
+                          const PipelineStatusCB& init_cb,
+                          const base::Closure& underflow_cb,
+                          const TimeCB& time_cb,
+                          const base::Closure& ended_cb,
+                          const base::Closure& disabled_cb,
+                          const PipelineStatusCB& error_cb) OVERRIDE;
   virtual void Play(const base::Closure& callback) OVERRIDE;
   virtual void Pause(const base::Closure& callback) OVERRIDE;
   virtual void Flush(const base::Closure& callback) OVERRIDE;
   virtual void Stop(const base::Closure& callback) OVERRIDE;
   virtual void SetPlaybackRate(float rate) OVERRIDE;
   virtual void Seek(base::TimeDelta time, const PipelineStatusCB& cb) OVERRIDE;
-
-  // AudioRenderer implementation.
-  virtual void Initialize(const scoped_refptr<AudioDecoder>& decoder,
-                          const PipelineStatusCB& init_cb,
-                          const base::Closure& underflow_cb,
-                          const TimeCB& time_cb) OVERRIDE;
   virtual bool HasEnded() OVERRIDE;
   virtual void ResumeAfterUnderflow(bool buffer_more_audio) OVERRIDE;
   virtual void SetVolume(float volume) OVERRIDE;
 
   // Disables underflow support.  When used, |state_| will never transition to
   // kUnderflow resulting in Render calls that underflow returning 0 frames
   // instead of some number of silence frames.  Must be called prior to
   // Initialize().
   void DisableUnderflowForTesting();
 
@@ skipping 62 matching lines @@
   // increments |pending_reads_|.
   //
   // Safe to call from any thread.
   void ScheduleRead_Locked();
 
   // Returns true if the data in the buffer is all before
   // |seek_timestamp_|. This can only return true while
   // in the kSeeking state.
   bool IsBeforeSeekTime(const scoped_refptr<Buffer>& buffer);
 
-  FilterHost* host_;
-
   // Audio decoder.
   scoped_refptr<AudioDecoder> decoder_;
 
   // Algorithm for scaling audio.
   scoped_ptr<AudioRendererAlgorithm> algorithm_;
 
   base::Lock lock_;
 
   // Simple state tracking variable.
   enum State {
@@ skipping 17 matching lines @@
   // The timestamp of the last frame (i.e. furthest in the future) buffered as
   // well as the current time that takes current playback delay into account.
   base::TimeDelta audio_time_buffered_;
   base::TimeDelta current_time_;
 
   // Filter callbacks.
   base::Closure pause_cb_;
   PipelineStatusCB seek_cb_;
 
   base::Closure underflow_cb_;
-
   TimeCB time_cb_;
+  base::Closure ended_cb_;
+  base::Closure disabled_cb_;
+  PipelineStatusCB error_cb_;
 
   base::TimeDelta seek_timestamp_;
 
   uint32 bytes_per_frame_;
 
   // Used to calculate audio delay given bytes.
   uint32 bytes_per_second_;
 
   // A flag that indicates this filter is called to stop.
   bool stopped_;
@@ skipping 25 matching lines @@
   bool underflow_disabled_;
 
   AudioDecoder::ReadCB read_cb_;
 
   DISALLOW_COPY_AND_ASSIGN(AudioRendererImpl);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_AUDIO_RENDERER_IMPL_H_