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

Unified Diff: media/tools/player_x11/player_x11.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/tools/player_wtl/movie.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/tools/player_x11/player_x11.cc
diff --git a/media/tools/player_x11/player_x11.cc b/media/tools/player_x11/player_x11.cc
index a90ede5b941dadeb83942905e11d94adeafb3ec7..42919ba34044861ac737220b6d27afad62475f62 100644
--- a/media/tools/player_x11/player_x11.cc
+++ b/media/tools/player_x11/player_x11.cc
@@ -28,7 +28,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"
#include "media/tools/player_x11/gl_video_renderer.h"
#include "media/tools/player_x11/x11_video_renderer.h"
@@ -96,10 +95,11 @@ void Paint(MessageLoop* message_loop, const PaintCB& paint_cb) {
g_video_renderer->PutCurrentFrame(video_frame);
}
+// TODO(vrk): Re-enabled audio. (crbug.com/112159)
bool InitPipeline(MessageLoop* message_loop,
const char* filename,
const PaintCB& paint_cb,
- bool enable_audio,
+ bool /* enable_audio */,
scoped_refptr<media::Pipeline>* pipeline,
MessageLoop* paint_message_loop,
media::MessageLoopFactory* message_loop_factory) {
@@ -132,12 +132,7 @@ bool InitPipeline(MessageLoop* message_loop,
base::Bind(&SetOpaque));
collection->AddVideoRenderer(g_video_renderer);
- if (enable_audio) {
- collection->AddAudioRenderer(
- new media::ReferenceAudioRenderer(g_audio_manager));
- } else {
- collection->AddAudioRenderer(new media::NullAudioRenderer());
- }
+ collection->AddAudioRenderer(new media::NullAudioRenderer());
// Create the pipeline and start it.
*pipeline = new media::Pipeline(message_loop, new media::MediaLog());
« no previous file with comments | « media/tools/player_wtl/movie.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698