Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(616)

Unified Diff: media/tools/player_wtl/movie.cc

Issue 9121062: Remove "high"-latency audio code path (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase ToT yet again Created 8 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/media.gyp ('k') | media/tools/player_x11/player_x11.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/tools/player_wtl/movie.cc
diff --git a/media/tools/player_wtl/movie.cc b/media/tools/player_wtl/movie.cc
index 4e44cfcc3d8bba2612b3a085cdbcf3694d3c52dc..6531d847bbed2e8865824115fc661da44c4df11d 100644
--- a/media/tools/player_wtl/movie.cc
+++ b/media/tools/player_wtl/movie.cc
@@ -17,7 +17,6 @@
#include "media/filters/ffmpeg_video_decoder.h"
#include "media/filters/file_data_source.h"
#include "media/filters/null_audio_renderer.h"
-#include "media/filters/reference_audio_renderer.h"
#include "media/filters/video_renderer_base.h"
using media::FFmpegAudioDecoder;
@@ -26,13 +25,12 @@ using media::FFmpegVideoDecoder;
using media::FileDataSource;
using media::FilterCollection;
using media::Pipeline;
-using media::ReferenceAudioRenderer;
namespace media {
Movie::Movie()
: audio_manager_(AudioManager::Create()),
- enable_audio_(true),
+ enable_audio_(false),
enable_draw_(true),
enable_dump_yuv_file_(false),
enable_pause_(false),
@@ -86,12 +84,8 @@ bool Movie::Open(const wchar_t* url, VideoRendererBase* video_renderer) {
collection->AddVideoDecoder(new FFmpegVideoDecoder(
message_loop_factory_->GetMessageLoop("VideoDecoderThread")));
- if (enable_audio_) {
- collection->AddAudioRenderer(
- new ReferenceAudioRenderer(audio_manager_));
- } else {
- collection->AddAudioRenderer(new media::NullAudioRenderer());
- }
+ // TODO(vrk): Re-enabled audio. (crbug.com/112159)
+ collection->AddAudioRenderer(new media::NullAudioRenderer());
collection->AddVideoRenderer(video_renderer);
// Create and start our pipeline.
@@ -162,7 +156,6 @@ bool Movie::GetPause() {
}
void Movie::SetAudioEnable(bool enable_audio) {
- enable_audio_ = enable_audio;
}
bool Movie::GetAudioEnable() {
« no previous file with comments | « media/media.gyp ('k') | media/tools/player_x11/player_x11.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698