| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 <iostream> | 5 #include <iostream> |
| 6 #include <signal.h> | 6 #include <signal.h> |
| 7 #include <X11/keysym.h> | 7 #include <X11/keysym.h> |
| 8 #include <X11/Xlib.h> | 8 #include <X11/Xlib.h> |
| 9 | 9 |
| 10 #include "base/at_exit.h" | 10 #include "base/at_exit.h" |
| (...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 85 | 85 |
| 86 // Create our filter factories. | 86 // Create our filter factories. |
| 87 scoped_ptr<media::FilterCollection> collection( | 87 scoped_ptr<media::FilterCollection> collection( |
| 88 new media::FilterCollection()); | 88 new media::FilterCollection()); |
| 89 collection->SetDemuxerFactory( | 89 collection->SetDemuxerFactory( |
| 90 new media::FFmpegDemuxerFactory( | 90 new media::FFmpegDemuxerFactory( |
| 91 new media::FileDataSourceFactory(), message_loop)); | 91 new media::FileDataSourceFactory(), message_loop)); |
| 92 collection->AddAudioDecoder(new media::FFmpegAudioDecoder( | 92 collection->AddAudioDecoder(new media::FFmpegAudioDecoder( |
| 93 message_loop_factory->GetMessageLoop("AudioDecoderThread"))); | 93 message_loop_factory->GetMessageLoop("AudioDecoderThread"))); |
| 94 collection->AddVideoDecoder(new media::FFmpegVideoDecoder( | 94 collection->AddVideoDecoder(new media::FFmpegVideoDecoder( |
| 95 message_loop_factory->GetMessageLoop("VideoDecoderThread"), | 95 message_loop_factory->GetMessageLoop("VideoDecoderThread"))); |
| 96 NULL)); | |
| 97 | 96 |
| 98 if (use_gl) { | 97 if (use_gl) { |
| 99 collection->AddVideoRenderer( | 98 collection->AddVideoRenderer( |
| 100 new GlVideoRenderer(g_display, g_window, paint_message_loop)); | 99 new GlVideoRenderer(g_display, g_window, paint_message_loop)); |
| 101 } else { | 100 } else { |
| 102 collection->AddVideoRenderer( | 101 collection->AddVideoRenderer( |
| 103 new X11VideoRenderer(g_display, g_window, paint_message_loop)); | 102 new X11VideoRenderer(g_display, g_window, paint_message_loop)); |
| 104 } | 103 } |
| 105 | 104 |
| 106 if (enable_audio) | 105 if (enable_audio) |
| (...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 258 } | 257 } |
| 259 | 258 |
| 260 // Cleanup tasks. | 259 // Cleanup tasks. |
| 261 message_loop_factory.reset(); | 260 message_loop_factory.reset(); |
| 262 | 261 |
| 263 thread->Stop(); | 262 thread->Stop(); |
| 264 XDestroyWindow(g_display, g_window); | 263 XDestroyWindow(g_display, g_window); |
| 265 XCloseDisplay(g_display); | 264 XCloseDisplay(g_display); |
| 266 return 0; | 265 return 0; |
| 267 } | 266 } |
| OLD | NEW |