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

Side by Side 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, 10 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « media/tools/player_wtl/movie.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <X11/keysym.h> 5 #include <X11/keysym.h>
6 #include <X11/Xlib.h> 6 #include <X11/Xlib.h>
7 #include <signal.h> 7 #include <signal.h>
8 8
9 #include <iostream> // NOLINT 9 #include <iostream> // NOLINT
10 10
(...skipping 10 matching lines...) Expand all
21 #include "media/base/media_log.h" 21 #include "media/base/media_log.h"
22 #include "media/base/media_switches.h" 22 #include "media/base/media_switches.h"
23 #include "media/base/message_loop_factory_impl.h" 23 #include "media/base/message_loop_factory_impl.h"
24 #include "media/base/pipeline.h" 24 #include "media/base/pipeline.h"
25 #include "media/base/video_frame.h" 25 #include "media/base/video_frame.h"
26 #include "media/filters/ffmpeg_audio_decoder.h" 26 #include "media/filters/ffmpeg_audio_decoder.h"
27 #include "media/filters/ffmpeg_demuxer_factory.h" 27 #include "media/filters/ffmpeg_demuxer_factory.h"
28 #include "media/filters/ffmpeg_video_decoder.h" 28 #include "media/filters/ffmpeg_video_decoder.h"
29 #include "media/filters/file_data_source.h" 29 #include "media/filters/file_data_source.h"
30 #include "media/filters/null_audio_renderer.h" 30 #include "media/filters/null_audio_renderer.h"
31 #include "media/filters/reference_audio_renderer.h"
32 #include "media/filters/video_renderer_base.h" 31 #include "media/filters/video_renderer_base.h"
33 #include "media/tools/player_x11/gl_video_renderer.h" 32 #include "media/tools/player_x11/gl_video_renderer.h"
34 #include "media/tools/player_x11/x11_video_renderer.h" 33 #include "media/tools/player_x11/x11_video_renderer.h"
35 34
36 static Display* g_display = NULL; 35 static Display* g_display = NULL;
37 static Window g_window = 0; 36 static Window g_window = 0;
38 static bool g_running = false; 37 static bool g_running = false;
39 38
40 AudioManager* g_audio_manager = NULL; 39 AudioManager* g_audio_manager = NULL;
41 40
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 return; 88 return;
90 } 89 }
91 90
92 scoped_refptr<media::VideoFrame> video_frame; 91 scoped_refptr<media::VideoFrame> video_frame;
93 g_video_renderer->GetCurrentFrame(&video_frame); 92 g_video_renderer->GetCurrentFrame(&video_frame);
94 if (video_frame) 93 if (video_frame)
95 paint_cb.Run(video_frame); 94 paint_cb.Run(video_frame);
96 g_video_renderer->PutCurrentFrame(video_frame); 95 g_video_renderer->PutCurrentFrame(video_frame);
97 } 96 }
98 97
98 // TODO(vrk): Re-enabled audio. (crbug.com/112159)
99 bool InitPipeline(MessageLoop* message_loop, 99 bool InitPipeline(MessageLoop* message_loop,
100 const char* filename, 100 const char* filename,
101 const PaintCB& paint_cb, 101 const PaintCB& paint_cb,
102 bool enable_audio, 102 bool /* enable_audio */,
103 scoped_refptr<media::Pipeline>* pipeline, 103 scoped_refptr<media::Pipeline>* pipeline,
104 MessageLoop* paint_message_loop, 104 MessageLoop* paint_message_loop,
105 media::MessageLoopFactory* message_loop_factory) { 105 media::MessageLoopFactory* message_loop_factory) {
106 // Load media libraries. 106 // Load media libraries.
107 if (!media::InitializeMediaLibrary(FilePath())) { 107 if (!media::InitializeMediaLibrary(FilePath())) {
108 std::cout << "Unable to initialize the media library." << std::endl; 108 std::cout << "Unable to initialize the media library." << std::endl;
109 return false; 109 return false;
110 } 110 }
111 111
112 // Open the file. 112 // Open the file.
(...skipping 12 matching lines...) Expand all
125 message_loop_factory->GetMessageLoop("AudioDecoderThread"))); 125 message_loop_factory->GetMessageLoop("AudioDecoderThread")));
126 collection->AddVideoDecoder(new media::FFmpegVideoDecoder( 126 collection->AddVideoDecoder(new media::FFmpegVideoDecoder(
127 message_loop_factory->GetMessageLoop("VideoDecoderThread"))); 127 message_loop_factory->GetMessageLoop("VideoDecoderThread")));
128 128
129 // Create our video renderer and save a reference to it for painting. 129 // Create our video renderer and save a reference to it for painting.
130 g_video_renderer = new media::VideoRendererBase( 130 g_video_renderer = new media::VideoRendererBase(
131 base::Bind(&Paint, paint_message_loop, paint_cb), 131 base::Bind(&Paint, paint_message_loop, paint_cb),
132 base::Bind(&SetOpaque)); 132 base::Bind(&SetOpaque));
133 collection->AddVideoRenderer(g_video_renderer); 133 collection->AddVideoRenderer(g_video_renderer);
134 134
135 if (enable_audio) { 135 collection->AddAudioRenderer(new media::NullAudioRenderer());
136 collection->AddAudioRenderer(
137 new media::ReferenceAudioRenderer(g_audio_manager));
138 } else {
139 collection->AddAudioRenderer(new media::NullAudioRenderer());
140 }
141 136
142 // Create the pipeline and start it. 137 // Create the pipeline and start it.
143 *pipeline = new media::Pipeline(message_loop, new media::MediaLog()); 138 *pipeline = new media::Pipeline(message_loop, new media::MediaLog());
144 media::PipelineStatusNotification note; 139 media::PipelineStatusNotification note;
145 (*pipeline)->Start( 140 (*pipeline)->Start(
146 collection.Pass(), filename, media::PipelineStatusCB(), 141 collection.Pass(), filename, media::PipelineStatusCB(),
147 media::PipelineStatusCB(), media::NetworkEventCB(), 142 media::PipelineStatusCB(), media::NetworkEventCB(),
148 note.Callback()); 143 note.Callback());
149 144
150 // Wait until the pipeline is fully initialized. 145 // Wait until the pipeline is fully initialized.
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after
313 // Release callback which releases video renderer. Do this before cleaning up 308 // Release callback which releases video renderer. Do this before cleaning up
314 // X below since the video renderer has some X cleanup duties as well. 309 // X below since the video renderer has some X cleanup duties as well.
315 paint_cb.Reset(); 310 paint_cb.Reset();
316 311
317 XDestroyWindow(g_display, g_window); 312 XDestroyWindow(g_display, g_window);
318 XCloseDisplay(g_display); 313 XCloseDisplay(g_display);
319 g_audio_manager = NULL; 314 g_audio_manager = NULL;
320 315
321 return 0; 316 return 0;
322 } 317 }
OLDNEW
« 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