Rename AudioRendererBase and AudioRendererAlgorithmBase

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
 //    Initialize() is called here with the audio format.
 //    Play/Pause/Seek also happens here.
 // 3. Audio thread created by the AudioRendererSink.
 //    Render() is called here where audio data is decoded into raw PCM data.
 //
-// AudioRendererBase talks to an AudioRendererAlgorithmBase that takes care of
+// AudioRendererImpl talks to an AudioRendererAlgorithm that takes care of
 // queueing audio data and stretching/shrinking audio data when playback rate !=
 // 1.0 or 0.0.
 
-#ifndef MEDIA_FILTERS_AUDIO_RENDERER_BASE_H_
-#define MEDIA_FILTERS_AUDIO_RENDERER_BASE_H_
+#ifndef MEDIA_FILTERS_AUDIO_RENDERER_IMPL_H_
+#define MEDIA_FILTERS_AUDIO_RENDERER_IMPL_H_
 
 #include <deque>
 
 #include "base/synchronization/lock.h"
 #include "media/base/audio_decoder.h"
 #include "media/base/audio_renderer_sink.h"
 #include "media/base/buffers.h"
 #include "media/base/filters.h"
-#include "media/filters/audio_renderer_algorithm_base.h"
+#include "media/filters/audio_renderer_algorithm.h"
 
 namespace media {
 
-class MEDIA_EXPORT AudioRendererBase
+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 AudioRendererBase(media::AudioRendererSink* sink);
-  virtual ~AudioRendererBase();
+  explicit AudioRendererImpl(media::AudioRendererSink* sink);
+  virtual ~AudioRendererImpl();
 
   // Methods called on pipeline thread ----------------------------------------
   // Filter implementation.
   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;
 
  private:
-  friend class AudioRendererBaseTest;
-  FRIEND_TEST_ALL_PREFIXES(AudioRendererBaseTest, EndOfStream);
-  FRIEND_TEST_ALL_PREFIXES(AudioRendererBaseTest, Underflow_EndOfStream);
+  friend class AudioRendererImplTest;
+  FRIEND_TEST_ALL_PREFIXES(AudioRendererImplTest, EndOfStream);
+  FRIEND_TEST_ALL_PREFIXES(AudioRendererImplTest, Underflow_EndOfStream);
 
   // Callback from the audio decoder delivering decoded audio samples.
   void DecodedAudioReady(scoped_refptr<Buffer> buffer);
 
   // Fills the given buffer with audio data by delegating to its |algorithm_|.
   // FillBuffer() also takes care of updating the clock. Returns the number of
   // frames copied into |dest|, which may be less than or equal to
   // |requested_frames|.
   //
   // If this method returns fewer frames than |requested_frames|, it could
@@ skipping 50 matching lines @@
 
   // 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);
 
   // Audio decoder.
   scoped_refptr<AudioDecoder> decoder_;
 
   // Algorithm for scaling audio.
-  scoped_ptr<AudioRendererAlgorithmBase> algorithm_;
+  scoped_ptr<AudioRendererAlgorithm> algorithm_;
 
   base::Lock lock_;
 
   // Simple state tracking variable.
   enum State {
     kUninitialized,
     kPaused,
     kSeeking,
     kPlaying,
     kStopped,
@@ skipping 50 matching lines @@
   // remember when it should stop playing, and do not assume that buffer is
   // empty till that time. Workaround is not bulletproof, as we don't exactly
   // know when that particular data would start playing, but it is much better
   // than nothing.
   base::Time earliest_end_time_;
 
   AudioParameters audio_parameters_;
 
   AudioDecoder::ReadCB read_cb_;
 
-  DISALLOW_COPY_AND_ASSIGN(AudioRendererBase);
+  DISALLOW_COPY_AND_ASSIGN(AudioRendererImpl);
 };
 
 }  // namespace media
 
-#endif  // MEDIA_FILTERS_AUDIO_RENDERER_BASE_H_
+#endif  // MEDIA_FILTERS_AUDIO_RENDERER_IMPL_H_