summaryrefslogtreecommitdiffstats
path: root/media/tools
diff options
context:
space:
mode:
authorfischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-07 22:43:03 +0000
committerfischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-07 22:43:03 +0000
commitacb2299648c3f60917946b4d87714e09d5815da6 (patch)
treefd0fa3a76fbb3717d725a8efe2ddd959d286da36 /media/tools
parent45f9c8f5200a9b3bc8990d5ba650da8dc47e7144 (diff)
downloadchromium_src-acb2299648c3f60917946b4d87714e09d5815da6.zip
chromium_src-acb2299648c3f60917946b4d87714e09d5815da6.tar.gz
chromium_src-acb2299648c3f60917946b4d87714e09d5815da6.tar.bz2
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
Diffstat (limited to 'media/tools')
-rw-r--r--media/tools/player_wtl/movie.cc6
-rw-r--r--media/tools/player_wtl/player_wtl.cc1
-rw-r--r--media/tools/player_x11/player_x11.cc4
3 files changed, 5 insertions, 6 deletions
diff --git a/media/tools/player_wtl/movie.cc b/media/tools/player_wtl/movie.cc
index ad6c704..3552c57 100644
--- a/media/tools/player_wtl/movie.cc
+++ b/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());
}
diff --git a/media/tools/player_wtl/player_wtl.cc b/media/tools/player_wtl/player_wtl.cc
index 72ba193..7ae160a 100644
--- a/media/tools/player_wtl/player_wtl.cc
+++ b/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"
diff --git a/media/tools/player_x11/player_x11.cc b/media/tools/player_x11/player_x11.cc
index 28b915b..c1a8213 100644
--- a/media/tools/player_x11/player_x11.cc
+++ b/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());