OLD | NEW |
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 <signal.h> | 5 #include <signal.h> |
6 | 6 |
7 #include <iostream> // NOLINT | 7 #include <iostream> // NOLINT |
8 | 8 |
9 #include "base/at_exit.h" | 9 #include "base/at_exit.h" |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 12 matching lines...) Expand all Loading... |
23 #include "media/base/media.h" | 23 #include "media/base/media.h" |
24 #include "media/base/media_log.h" | 24 #include "media/base/media_log.h" |
25 #include "media/base/media_switches.h" | 25 #include "media/base/media_switches.h" |
26 #include "media/base/pipeline.h" | 26 #include "media/base/pipeline.h" |
27 #include "media/base/video_frame.h" | 27 #include "media/base/video_frame.h" |
28 #include "media/filters/audio_renderer_impl.h" | 28 #include "media/filters/audio_renderer_impl.h" |
29 #include "media/filters/ffmpeg_audio_decoder.h" | 29 #include "media/filters/ffmpeg_audio_decoder.h" |
30 #include "media/filters/ffmpeg_demuxer.h" | 30 #include "media/filters/ffmpeg_demuxer.h" |
31 #include "media/filters/ffmpeg_video_decoder.h" | 31 #include "media/filters/ffmpeg_video_decoder.h" |
32 #include "media/filters/file_data_source.h" | 32 #include "media/filters/file_data_source.h" |
| 33 #include "media/filters/video_frame_scheduler_impl.h" |
| 34 #include "media/filters/video_frame_scheduler_proxy.h" |
33 #include "media/filters/video_renderer_impl.h" | 35 #include "media/filters/video_renderer_impl.h" |
34 #include "media/tools/player_x11/data_source_logger.h" | 36 #include "media/tools/player_x11/data_source_logger.h" |
35 | 37 |
36 // Include X11 headers here because X11/Xlib.h #define's Status | 38 // Include X11 headers here because X11/Xlib.h #define's Status |
37 // which causes compiler errors with Status enum declarations | 39 // which causes compiler errors with Status enum declarations |
38 // in media::DemuxerStream & media::AudioDecoder. | 40 // in media::DemuxerStream & media::AudioDecoder. |
39 #include <X11/XKBlib.h> | 41 #include <X11/XKBlib.h> |
40 #include <X11/Xlib.h> | 42 #include <X11/Xlib.h> |
41 #include "media/tools/player_x11/gl_video_renderer.h" | 43 #include "media/tools/player_x11/gl_video_renderer.h" |
42 #include "media/tools/player_x11/x11_video_renderer.h" | 44 #include "media/tools/player_x11/x11_video_renderer.h" |
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
96 media::PipelineStatus status) { | 98 media::PipelineStatus status) { |
97 *status_out = status; | 99 *status_out = status; |
98 event->Signal(); | 100 event->Signal(); |
99 } | 101 } |
100 | 102 |
101 // TODO(vrk): Re-enabled audio. (crbug.com/112159) | 103 // TODO(vrk): Re-enabled audio. (crbug.com/112159) |
102 void InitPipeline( | 104 void InitPipeline( |
103 media::Pipeline* pipeline, | 105 media::Pipeline* pipeline, |
104 const scoped_refptr<base::SingleThreadTaskRunner>& task_runner, | 106 const scoped_refptr<base::SingleThreadTaskRunner>& task_runner, |
105 media::Demuxer* demuxer, | 107 media::Demuxer* demuxer, |
106 const media::VideoRendererImpl::PaintCB& paint_cb, | 108 scoped_ptr<media::VideoFrameScheduler> scheduler, |
107 bool /* enable_audio */) { | 109 bool /* enable_audio */) { |
108 // Create our filter factories. | 110 // Create our filter factories. |
109 scoped_ptr<media::FilterCollection> collection( | 111 scoped_ptr<media::FilterCollection> collection( |
110 new media::FilterCollection()); | 112 new media::FilterCollection()); |
111 collection->SetDemuxer(demuxer); | 113 collection->SetDemuxer(demuxer); |
112 | 114 |
113 ScopedVector<media::VideoDecoder> video_decoders; | 115 ScopedVector<media::VideoDecoder> video_decoders; |
114 video_decoders.push_back(new media::FFmpegVideoDecoder(task_runner)); | 116 video_decoders.push_back(new media::FFmpegVideoDecoder(task_runner)); |
115 scoped_ptr<media::VideoRenderer> video_renderer(new media::VideoRendererImpl( | 117 scoped_ptr<media::VideoRenderer> video_renderer(new media::VideoRendererImpl( |
116 task_runner, | 118 task_runner, |
| 119 scheduler.Pass(), |
117 video_decoders.Pass(), | 120 video_decoders.Pass(), |
118 media::SetDecryptorReadyCB(), | 121 media::SetDecryptorReadyCB())); |
119 paint_cb, | |
120 true)); | |
121 collection->SetVideoRenderer(video_renderer.Pass()); | 122 collection->SetVideoRenderer(video_renderer.Pass()); |
122 | 123 |
123 ScopedVector<media::AudioDecoder> audio_decoders; | 124 ScopedVector<media::AudioDecoder> audio_decoders; |
124 audio_decoders.push_back(new media::FFmpegAudioDecoder(task_runner)); | 125 audio_decoders.push_back(new media::FFmpegAudioDecoder(task_runner)); |
125 media::AudioParameters out_params( | 126 media::AudioParameters out_params( |
126 media::AudioParameters::AUDIO_PCM_LOW_LATENCY, | 127 media::AudioParameters::AUDIO_PCM_LOW_LATENCY, |
127 media::CHANNEL_LAYOUT_STEREO, | 128 media::CHANNEL_LAYOUT_STEREO, |
128 44100, | 129 44100, |
129 16, | 130 16, |
130 512); | 131 512); |
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
258 | 259 |
259 // Initialize X11. | 260 // Initialize X11. |
260 if (!InitX11()) | 261 if (!InitX11()) |
261 return 1; | 262 return 1; |
262 | 263 |
263 // Initialize the pipeline thread and the pipeline. | 264 // Initialize the pipeline thread and the pipeline. |
264 base::MessageLoop message_loop; | 265 base::MessageLoop message_loop; |
265 base::Thread media_thread("MediaThread"); | 266 base::Thread media_thread("MediaThread"); |
266 media_thread.Start(); | 267 media_thread.Start(); |
267 | 268 |
268 media::VideoRendererImpl::PaintCB paint_cb; | 269 media::VideoFrameSchedulerImpl::DisplayCB display_cb; |
269 if (command_line->HasSwitch("use-gl")) { | 270 if (command_line->HasSwitch("use-gl")) { |
270 paint_cb = media::BindToCurrentLoop(base::Bind( | 271 display_cb = base::Bind(&GlVideoRenderer::Paint, |
271 &GlVideoRenderer::Paint, new GlVideoRenderer(g_display, g_window))); | 272 new GlVideoRenderer(g_display, g_window)); |
272 } else { | 273 } else { |
273 paint_cb = media::BindToCurrentLoop(base::Bind( | 274 display_cb = base::Bind(&X11VideoRenderer::Paint, |
274 &X11VideoRenderer::Paint, new X11VideoRenderer(g_display, g_window))); | 275 new X11VideoRenderer(g_display, g_window)); |
275 } | 276 } |
276 | 277 |
| 278 scoped_ptr<media::VideoFrameScheduler> scheduler_impl( |
| 279 new media::VideoFrameSchedulerImpl(message_loop.message_loop_proxy(), |
| 280 display_cb)); |
| 281 scoped_ptr<media::VideoFrameScheduler> scheduler_proxy( |
| 282 new media::VideoFrameSchedulerProxy(media_thread.message_loop_proxy(), |
| 283 message_loop.message_loop_proxy(), |
| 284 scheduler_impl.Pass())); |
| 285 |
277 scoped_ptr<media::DataSource> data_source(new DataSourceLogger( | 286 scoped_ptr<media::DataSource> data_source(new DataSourceLogger( |
278 CreateDataSource(filename), command_line->HasSwitch("streaming"))); | 287 CreateDataSource(filename), command_line->HasSwitch("streaming"))); |
279 scoped_ptr<media::Demuxer> demuxer(new media::FFmpegDemuxer( | 288 scoped_ptr<media::Demuxer> demuxer(new media::FFmpegDemuxer( |
280 media_thread.message_loop_proxy(), data_source.get(), | 289 media_thread.message_loop_proxy(), data_source.get(), |
281 base::Bind(&NeedKey), new media::MediaLog())); | 290 base::Bind(&NeedKey), new media::MediaLog())); |
282 | 291 |
283 media::Pipeline pipeline(media_thread.message_loop_proxy(), | 292 media::Pipeline pipeline(media_thread.message_loop_proxy(), |
284 new media::MediaLog()); | 293 new media::MediaLog()); |
285 InitPipeline(&pipeline, media_thread.message_loop_proxy(), demuxer.get(), | 294 InitPipeline(&pipeline, media_thread.message_loop_proxy(), demuxer.get(), |
286 paint_cb, command_line->HasSwitch("audio")); | 295 scheduler_proxy.Pass(), command_line->HasSwitch("audio")); |
287 | 296 |
288 // Main loop of the application. | 297 // Main loop of the application. |
289 g_running = true; | 298 g_running = true; |
290 | 299 |
291 message_loop.PostTask(FROM_HERE, base::Bind( | 300 message_loop.PostTask(FROM_HERE, base::Bind( |
292 &PeriodicalUpdate, base::Unretained(&pipeline), &message_loop)); | 301 &PeriodicalUpdate, base::Unretained(&pipeline), &message_loop)); |
293 message_loop.Run(); | 302 message_loop.Run(); |
294 | 303 |
295 // Cleanup tasks. | 304 // Cleanup tasks. |
296 media_thread.Stop(); | 305 media_thread.Stop(); |
297 | 306 |
298 // Release callback which releases video renderer. Do this before cleaning up | 307 // Release callback which releases video renderer. Do this before cleaning up |
299 // X below since the video renderer has some X cleanup duties as well. | 308 // X below since the video renderer has some X cleanup duties as well. |
300 paint_cb.Reset(); | 309 display_cb.Reset(); |
301 | 310 |
302 XDestroyWindow(g_display, g_window); | 311 XDestroyWindow(g_display, g_window); |
303 XCloseDisplay(g_display); | 312 XCloseDisplay(g_display); |
304 g_audio_manager = NULL; | 313 g_audio_manager = NULL; |
305 | 314 |
306 return 0; | 315 return 0; |
307 } | 316 } |
OLD | NEW |