Merge AudioRendererImpl and AudioRendererBase; add NullAudioSink

media/tools/player_wtl/movie.cc

 // 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.
 
 #include "media/tools/player_wtl/movie.h"
 
 #include "base/bind.h"
 #include "base/memory/singleton.h"
 #include "base/threading/platform_thread.h"
 #include "base/utf_string_conversions.h"
 #include "media/audio/audio_manager.h"
+#include "media/audio/null_audio_sink.h"
 #include "media/base/filter_collection.h"
 #include "media/base/media_log.h"
 #include "media/base/message_loop_factory.h"
 #include "media/base/pipeline.h"
+#include "media/filters/audio_renderer_base.h"
 #include "media/filters/ffmpeg_audio_decoder.h"
 #include "media/filters/ffmpeg_demuxer.h"
 #include "media/filters/ffmpeg_video_decoder.h"
 #include "media/filters/file_data_source.h"
-#include "media/filters/null_audio_renderer.h"
 #include "media/filters/video_renderer_base.h"
 
 namespace media {
 
 Movie::Movie()
     : audio_manager_(AudioManager::Create()),
       enable_audio_(false),
       enable_draw_(true),
       enable_dump_yuv_file_(false),
       enable_pause_(false),
@@ skipping 45 matching lines @@
   collection->AddAudioDecoder(new FFmpegAudioDecoder(
       base::Bind(&MessageLoopFactory::GetMessageLoop,
                  base::Unretained(message_loop_factory_.get()),
                  "AudioDecoderThread")));
   collection->AddVideoDecoder(new FFmpegVideoDecoder(
       base::Bind(&MessageLoopFactory::GetMessageLoop,
                  base::Unretained(message_loop_factory_.get()),
                  "VideoDecoderThread")));
 
   // TODO(vrk): Re-enabled audio. (crbug.com/112159)
-  collection->AddAudioRenderer(new media::NullAudioRenderer());
+  collection->AddAudioRenderer(
+      new media::AudioRendererBase(new media::NullAudioSink()));
   collection->AddVideoRenderer(video_renderer);
 
   // Create and start our pipeline.
   media::PipelineStatusNotification note;
   pipeline_->Start(
       collection.Pass(),
       media::PipelineStatusCB(),
       media::PipelineStatusCB(),
       media::NetworkEventCB(),
       note.Callback());
@@ skipping 82 matching lines @@
 void Movie::Close() {
   if (pipeline_) {
     pipeline_->Stop(base::Closure());
     pipeline_ = NULL;
   }
 
   message_loop_factory_.reset();
 }
 
 }  // namespace media