diff options
| author | vrk@chromium.org <vrk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-06 03:17:44 +0000 |
|---|---|---|
| committer | vrk@chromium.org <vrk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-06 03:17:44 +0000 |
| commit | e4fc09e874d7a7fc87dc1565452d32985949a3cf (patch) | |
| tree | 8a8a5f596294a3db7c6aa3998b8562a4b24e60e9 /media/tools | |
| parent | f2ebbf06167ad4ff8cb23109b3652c8c4b7ff5f7 (diff) | |
| download | chromium_src-e4fc09e874d7a7fc87dc1565452d32985949a3cf.zip chromium_src-e4fc09e874d7a7fc87dc1565452d32985949a3cf.tar.gz chromium_src-e4fc09e874d7a7fc87dc1565452d32985949a3cf.tar.bz2 | |
Merge AudioRendererImpl and AudioRendererBase; add NullAudioSink
This CL removes AudioRendererImpl and replaces it with AudioRendererBase.
NullAudioRenderer is also removed and replaced with NullAudioSink.
Also, a subtle bug is fixed in AudioRendererBase to allow for smooth
video playback when running Chrome with the --disable-audio flag.
BUG=119549,116645
TEST=media_unittests, playing video on Chrome/content_shell with and without --disable-audio flag should look identical
Review URL: http://codereview.chromium.org/9826023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@131089 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/tools')
| -rw-r--r-- | media/tools/player_wtl/movie.cc | 6 | ||||
| -rw-r--r-- | media/tools/player_x11/player_x11.cc | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/media/tools/player_wtl/movie.cc b/media/tools/player_wtl/movie.cc index 781f377..110acc0 100644 --- a/media/tools/player_wtl/movie.cc +++ b/media/tools/player_wtl/movie.cc @@ -9,15 +9,16 @@ #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 { @@ -83,7 +84,8 @@ bool Movie::Open(const wchar_t* url, VideoRendererBase* video_renderer) { "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. diff --git a/media/tools/player_x11/player_x11.cc b/media/tools/player_x11/player_x11.cc index ce2ff07..b22e696 100644 --- a/media/tools/player_x11/player_x11.cc +++ b/media/tools/player_x11/player_x11.cc @@ -16,6 +16,7 @@ #include "base/threading/platform_thread.h" #include "base/threading/thread.h" #include "media/audio/audio_manager.h" +#include "media/audio/null_audio_sink.h" #include "media/base/filter_collection.h" #include "media/base/media.h" #include "media/base/media_log.h" @@ -23,11 +24,11 @@ #include "media/base/message_loop_factory.h" #include "media/base/pipeline.h" #include "media/base/video_frame.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" #include "media/tools/player_x11/data_source_logger.h" #include "media/tools/player_x11/gl_video_renderer.h" @@ -127,7 +128,8 @@ bool InitPipeline(MessageLoop* message_loop, true); collection->AddVideoRenderer(g_video_renderer); - collection->AddAudioRenderer(new media::NullAudioRenderer()); + collection->AddAudioRenderer( + new media::AudioRendererBase(new media::NullAudioSink())); // Create the pipeline and start it. *pipeline = new media::Pipeline(message_loop, new media::MediaLog()); |