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" |
11 #include "base/command_line.h" | 11 #include "base/command_line.h" |
12 #include "base/file_path.h" | 12 #include "base/file_path.h" |
13 #include "base/memory/scoped_ptr.h" | 13 #include "base/memory/scoped_ptr.h" |
14 #include "base/threading/platform_thread.h" | 14 #include "base/threading/platform_thread.h" |
15 #include "base/threading/thread.h" | 15 #include "base/threading/thread.h" |
16 #include "media/audio/audio_manager.h" | 16 #include "media/audio/audio_manager.h" |
17 #include "media/audio/null_audio_sink.h" | 17 #include "media/audio/null_audio_sink.h" |
18 #include "media/base/filter_collection.h" | 18 #include "media/base/filter_collection.h" |
19 #include "media/base/media.h" | 19 #include "media/base/media.h" |
20 #include "media/base/media_log.h" | 20 #include "media/base/media_log.h" |
21 #include "media/base/media_switches.h" | 21 #include "media/base/media_switches.h" |
22 #include "media/base/message_loop_factory.h" | |
23 #include "media/base/pipeline.h" | 22 #include "media/base/pipeline.h" |
24 #include "media/base/video_frame.h" | 23 #include "media/base/video_frame.h" |
25 #include "media/filters/audio_renderer_impl.h" | 24 #include "media/filters/audio_renderer_impl.h" |
26 #include "media/filters/ffmpeg_audio_decoder.h" | 25 #include "media/filters/ffmpeg_audio_decoder.h" |
27 #include "media/filters/ffmpeg_demuxer.h" | 26 #include "media/filters/ffmpeg_demuxer.h" |
28 #include "media/filters/ffmpeg_video_decoder.h" | 27 #include "media/filters/ffmpeg_video_decoder.h" |
29 #include "media/filters/file_data_source.h" | 28 #include "media/filters/file_data_source.h" |
30 #include "media/filters/video_renderer_base.h" | 29 #include "media/filters/video_renderer_base.h" |
31 #include "media/tools/player_x11/data_source_logger.h" | 30 #include "media/tools/player_x11/data_source_logger.h" |
32 | 31 |
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
99 | 98 |
100 static void OnBufferingState(media::Pipeline::BufferingState buffering_state) {} | 99 static void OnBufferingState(media::Pipeline::BufferingState buffering_state) {} |
101 | 100 |
102 // TODO(vrk): Re-enabled audio. (crbug.com/112159) | 101 // TODO(vrk): Re-enabled audio. (crbug.com/112159) |
103 bool InitPipeline(const scoped_refptr<base::MessageLoopProxy>& message_loop, | 102 bool InitPipeline(const scoped_refptr<base::MessageLoopProxy>& message_loop, |
104 const scoped_refptr<media::DataSource>& data_source, | 103 const scoped_refptr<media::DataSource>& data_source, |
105 const PaintCB& paint_cb, | 104 const PaintCB& paint_cb, |
106 bool /* enable_audio */, | 105 bool /* enable_audio */, |
107 scoped_refptr<media::Pipeline>* pipeline, | 106 scoped_refptr<media::Pipeline>* pipeline, |
108 MessageLoop* paint_message_loop, | 107 MessageLoop* paint_message_loop, |
109 media::MessageLoopFactory* message_loop_factory) { | 108 media::MessageLoopFactory* message_loop_factory) { |
acolwell GONE FROM CHROMIUM
2012/12/10 18:12:16
What about this?
| |
110 // Create our filter factories. | 109 // Create our filter factories. |
111 scoped_ptr<media::FilterCollection> collection( | 110 scoped_ptr<media::FilterCollection> collection( |
112 new media::FilterCollection()); | 111 new media::FilterCollection()); |
113 collection->SetDemuxer(new media::FFmpegDemuxer(message_loop, data_source)); | 112 collection->SetDemuxer(new media::FFmpegDemuxer(message_loop, data_source)); |
114 collection->GetAudioDecoders()->push_back(new media::FFmpegAudioDecoder( | 113 collection->GetAudioDecoders()->push_back(new media::FFmpegAudioDecoder( |
115 message_loop)); | 114 message_loop)); |
116 collection->GetVideoDecoders()->push_back(new media::FFmpegVideoDecoder( | 115 collection->GetVideoDecoders()->push_back(new media::FFmpegVideoDecoder( |
117 message_loop, NULL)); | 116 message_loop, NULL)); |
118 | 117 |
119 // Create our video renderer and save a reference to it for painting. | 118 // Create our video renderer and save a reference to it for painting. |
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
249 | 248 |
250 // Install the signal handler. | 249 // Install the signal handler. |
251 signal(SIGTERM, &TerminateHandler); | 250 signal(SIGTERM, &TerminateHandler); |
252 signal(SIGINT, &TerminateHandler); | 251 signal(SIGINT, &TerminateHandler); |
253 | 252 |
254 // Initialize X11. | 253 // Initialize X11. |
255 if (!InitX11()) | 254 if (!InitX11()) |
256 return 1; | 255 return 1; |
257 | 256 |
258 // Initialize the pipeline thread and the pipeline. | 257 // Initialize the pipeline thread and the pipeline. |
259 scoped_ptr<media::MessageLoopFactory> message_loop_factory( | 258 scoped_ptr<media::MessageLoopFactory> message_loop_factory( |
acolwell GONE FROM CHROMIUM
2012/12/10 18:12:16
ditto
| |
260 new media::MessageLoopFactory()); | 259 new media::MessageLoopFactory()); |
261 scoped_ptr<base::Thread> thread; | 260 scoped_ptr<base::Thread> thread; |
262 scoped_refptr<media::Pipeline> pipeline; | 261 scoped_refptr<media::Pipeline> pipeline; |
263 MessageLoop message_loop; | 262 MessageLoop message_loop; |
264 thread.reset(new base::Thread("PipelineThread")); | 263 thread.reset(new base::Thread("PipelineThread")); |
265 thread->Start(); | 264 thread->Start(); |
266 | 265 |
267 PaintCB paint_cb; | 266 PaintCB paint_cb; |
268 if (command_line->HasSwitch("use-gl")) { | 267 if (command_line->HasSwitch("use-gl")) { |
269 paint_cb = base::Bind( | 268 paint_cb = base::Bind( |
(...skipping 28 matching lines...) Expand all Loading... | |
298 // Release callback which releases video renderer. Do this before cleaning up | 297 // 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. | 298 // X below since the video renderer has some X cleanup duties as well. |
300 paint_cb.Reset(); | 299 paint_cb.Reset(); |
301 | 300 |
302 XDestroyWindow(g_display, g_window); | 301 XDestroyWindow(g_display, g_window); |
303 XCloseDisplay(g_display); | 302 XCloseDisplay(g_display); |
304 g_audio_manager = NULL; | 303 g_audio_manager = NULL; |
305 | 304 |
306 return 0; | 305 return 0; |
307 } | 306 } |
OLD | NEW |