Rename media::AudioRendererImpl to media::ReferenceAudioRendererImpl.

This removes the name-collision with ::AudioRendererImpl, which lives in
content/renderer/media, and is actually the implementation used in chrome.

BUG=none
TEST=trybots

Review URL: http://codereview.chromium.org/8201018

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104587 0039d316-1c4b-4281-b951-d872f2087c98

media/filters/reference_audio_renderer.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "media/filters/audio_renderer_impl.h"
+#include "media/filters/reference_audio_renderer.h"
 
 #include <math.h>
 
@@ -12,17 +12,17 @@
 
 namespace media {
 
-// We'll try to fill 4096 samples per buffer, which is roughly ~92ms of audio
-// data for a 44.1kHz audio source.
-static const size_t kSamplesPerBuffer = 8*1024;
+// This is an arbitrary number, ~184ms in a 44.1kHz stream, assuming a playback
+// rate of 1.0.
+static const size_t kSamplesPerBuffer = 8 * 1024;
 
-AudioRendererImpl::AudioRendererImpl()
+ReferenceAudioRenderer::ReferenceAudioRenderer()
     : AudioRendererBase(),
       stream_(NULL),
       bytes_per_second_(0) {
 }
 
-AudioRendererImpl::~AudioRendererImpl() {
+ReferenceAudioRenderer::~ReferenceAudioRenderer() {
   // Close down the audio device.
   if (stream_) {
     stream_->Stop();
@@ -30,7 +30,7 @@ AudioRendererImpl::~AudioRendererImpl() {
   }
 }
 
-void AudioRendererImpl::SetPlaybackRate(float rate) {
+void ReferenceAudioRenderer::SetPlaybackRate(float rate) {
   // TODO(fbarchard): limit rate to reasonable values
   AudioRendererBase::SetPlaybackRate(rate);
 
@@ -39,12 +39,12 @@ void AudioRendererImpl::SetPlaybackRate(float rate) {
     stream_->Start(this);
 }
 
-void AudioRendererImpl::SetVolume(float volume) {
+void ReferenceAudioRenderer::SetVolume(float volume) {
   if (stream_)
     stream_->SetVolume(volume);
 }
 
-uint32 AudioRendererImpl::OnMoreData(
+uint32 ReferenceAudioRenderer::OnMoreData(
     AudioOutputStream* stream, uint8* dest, uint32 len,
     AudioBuffersState buffers_state) {
   // TODO(scherkus): handle end of stream.
@@ -62,19 +62,19 @@ uint32 AudioRendererImpl::OnMoreData(
   return FillBuffer(dest, len, delay, buffers_empty);
 }
 
-void AudioRendererImpl::OnClose(AudioOutputStream* stream) {
+void ReferenceAudioRenderer::OnClose(AudioOutputStream* stream) {
   // TODO(scherkus): implement OnClose.
   NOTIMPLEMENTED();
 }
 
-void AudioRendererImpl::OnError(AudioOutputStream* stream, int code) {
+void ReferenceAudioRenderer::OnError(AudioOutputStream* stream, int code) {
   // TODO(scherkus): implement OnError.
   NOTIMPLEMENTED();
 }
 
-bool AudioRendererImpl::OnInitialize(int bits_per_channel,
-                                     ChannelLayout channel_layout,
-                                     int sample_rate) {
+bool ReferenceAudioRenderer::OnInitialize(int bits_per_channel,
+                                              ChannelLayout channel_layout,
+                                              int sample_rate) {
   AudioParameters params(AudioParameters::AUDIO_PCM_LINEAR, channel_layout,
                          sample_rate, bits_per_channel, kSamplesPerBuffer);
 
@@ -92,7 +92,7 @@ bool AudioRendererImpl::OnInitialize(int bits_per_channel,
   return true;
 }
 
-void AudioRendererImpl::OnStop() {
+void ReferenceAudioRenderer::OnStop() {
   if (stream_)
     stream_->Stop();
 }

media/filters/reference_audio_renderer.h

@@ -2,13 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_FILTERS_AUDIO_RENDERER_IMPL_H_
-#define MEDIA_FILTERS_AUDIO_RENDERER_IMPL_H_
+#ifndef MEDIA_FILTERS_REFERENCE_AUDIO_RENDERER_H_
+#define MEDIA_FILTERS_REFERENCE_AUDIO_RENDERER_H_
 
-// This is the default implementation of AudioRenderer, which uses the audio
-// interfaces to open an audio device.  Although it cannot be used in the
-// sandbox, it serves as a reference implementation and can be used in other
-// applications such as the test player.
+// This is the reference implementation of AudioRenderer, which uses the audio
+// interfaces to open an audio device.  It cannot be used in the sandbox, but is
+// used in other applications such as the test player.
 //
 // Note: THIS IS NOT THE AUDIO RENDERER USED IN CHROME.
 //
@@ -24,12 +23,12 @@
 
 namespace media {
 
-class MEDIA_EXPORT AudioRendererImpl
+class MEDIA_EXPORT ReferenceAudioRenderer
     : public AudioRendererBase,
       public AudioOutputStream::AudioSourceCallback {
  public:
-  AudioRendererImpl();
-  virtual ~AudioRendererImpl();
+  ReferenceAudioRenderer();
+  virtual ~ReferenceAudioRenderer();
 
   // Filter implementation.
   virtual void SetPlaybackRate(float playback_rate);
@@ -55,9 +54,9 @@ class MEDIA_EXPORT AudioRendererImpl
   AudioOutputStream* stream_;
   int bytes_per_second_;
 
-  DISALLOW_COPY_AND_ASSIGN(AudioRendererImpl);
+  DISALLOW_COPY_AND_ASSIGN(ReferenceAudioRenderer);
 };
 
 }  // namespace media
 
-#endif  // MEDIA_FILTERS_AUDIO_RENDERER_IMPL_H_
+#endif  // MEDIA_FILTERS_REFERENCE_AUDIO_RENDERER_H_

media/media.gyp

@@ -163,8 +163,6 @@
         'filters/audio_renderer_algorithm_ola.h',
         'filters/audio_renderer_base.cc',
         'filters/audio_renderer_base.h',
-        'filters/audio_renderer_impl.cc',
-        'filters/audio_renderer_impl.h',
         'filters/bitstream_converter.cc',
         'filters/bitstream_converter.h',
         'filters/chunk_demuxer.cc',
@@ -198,6 +196,8 @@
         'filters/null_audio_renderer.h',
         'filters/null_video_renderer.cc',
         'filters/null_video_renderer.h',
+        'filters/reference_audio_renderer.cc',
+        'filters/reference_audio_renderer.h',
         'filters/video_renderer_base.cc',
         'filters/video_renderer_base.h',
         'video/capture/fake_video_capture_device.cc',

media/tools/player_wtl/movie.cc

@@ -11,21 +11,21 @@
 #include "media/base/media_log.h"
 #include "media/base/message_loop_factory_impl.h"
 #include "media/base/pipeline_impl.h"
-#include "media/filters/audio_renderer_impl.h"
 #include "media/filters/ffmpeg_audio_decoder.h"
 #include "media/filters/ffmpeg_demuxer_factory.h"
 #include "media/filters/ffmpeg_video_decoder.h"
 #include "media/filters/file_data_source_factory.h"
 #include "media/filters/null_audio_renderer.h"
+#include "media/filters/reference_audio_renderer.h"
 #include "media/tools/player_wtl/wtl_renderer.h"
 
-using media::AudioRendererImpl;
 using media::FFmpegAudioDecoder;
 using media::FFmpegDemuxerFactory;
 using media::FFmpegVideoDecoder;
 using media::FileDataSourceFactory;
 using media::FilterCollection;
 using media::PipelineImpl;
+using media::ReferenceAudioRenderer;
 
 namespace media {
 
@@ -78,7 +78,7 @@ bool Movie::Open(const wchar_t* url, WtlVideoRenderer* video_renderer) {
       message_loop_factory_->GetMessageLoop("VideoDecoderThread"), NULL));
 
   if (enable_audio_) {
-    collection->AddAudioRenderer(new AudioRendererImpl());
+    collection->AddAudioRenderer(new ReferenceAudioRenderer());
   } else {
     collection->AddAudioRenderer(new media::NullAudioRenderer());
   }

media/tools/player_wtl/player_wtl.cc

@@ -9,7 +9,6 @@
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "media/base/pipeline_impl.h"
-#include "media/filters/audio_renderer_impl.h"
 #include "media/filters/ffmpeg_audio_decoder.h"
 #include "media/filters/ffmpeg_demuxer.h"
 #include "media/filters/ffmpeg_video_decoder.h"

media/tools/player_x11/player_x11.cc

@@ -20,12 +20,12 @@
 #include "media/base/media_switches.h"
 #include "media/base/message_loop_factory_impl.h"
 #include "media/base/pipeline_impl.h"
-#include "media/filters/audio_renderer_impl.h"
 #include "media/filters/ffmpeg_audio_decoder.h"
 #include "media/filters/ffmpeg_demuxer_factory.h"
 #include "media/filters/ffmpeg_video_decoder.h"
 #include "media/filters/file_data_source_factory.h"
 #include "media/filters/null_audio_renderer.h"
+#include "media/filters/reference_audio_renderer.h"
 #include "media/tools/player_x11/gl_video_renderer.h"
 #include "media/tools/player_x11/x11_video_renderer.h"
 
@@ -104,7 +104,7 @@ bool InitPipeline(MessageLoop* message_loop,
   }
 
   if (enable_audio)
-    collection->AddAudioRenderer(new media::AudioRendererImpl());
+    collection->AddAudioRenderer(new media::ReferenceAudioRenderer());
   else
     collection->AddAudioRenderer(new media::NullAudioRenderer());