| 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 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 114 video_decoders.push_back(new media::FFmpegVideoDecoder(task_runner)); | 114 video_decoders.push_back(new media::FFmpegVideoDecoder(task_runner)); |
| 115 scoped_ptr<media::VideoRenderer> video_renderer(new media::VideoRendererImpl( | 115 scoped_ptr<media::VideoRenderer> video_renderer(new media::VideoRendererImpl( |
| 116 task_runner, | 116 task_runner, |
| 117 video_decoders.Pass(), | 117 video_decoders.Pass(), |
| 118 media::SetDecryptorReadyCB(), | 118 media::SetDecryptorReadyCB(), |
| 119 paint_cb, | 119 paint_cb, |
| 120 true)); | 120 true)); |
| 121 collection->SetVideoRenderer(video_renderer.Pass()); | 121 collection->SetVideoRenderer(video_renderer.Pass()); |
| 122 | 122 |
| 123 ScopedVector<media::AudioDecoder> audio_decoders; | 123 ScopedVector<media::AudioDecoder> audio_decoders; |
| 124 audio_decoders.push_back(new media::FFmpegAudioDecoder(task_runner)); | 124 audio_decoders.push_back(new media::FFmpegAudioDecoder(task_runner, |
| 125 media::LogCB())); |
| 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); |
| 131 media::AudioHardwareConfig hardware_config(out_params, out_params); | 132 media::AudioHardwareConfig hardware_config(out_params, out_params); |
| 132 | 133 |
| 133 scoped_ptr<media::AudioRenderer> audio_renderer( | 134 scoped_ptr<media::AudioRenderer> audio_renderer( |
| 134 new media::AudioRendererImpl(task_runner, | 135 new media::AudioRendererImpl(task_runner, |
| (...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 298 // Release callback which releases video renderer. Do this before cleaning up | 299 // 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. | 300 // X below since the video renderer has some X cleanup duties as well. |
| 300 paint_cb.Reset(); | 301 paint_cb.Reset(); |
| 301 | 302 |
| 302 XDestroyWindow(g_display, g_window); | 303 XDestroyWindow(g_display, g_window); |
| 303 XCloseDisplay(g_display); | 304 XCloseDisplay(g_display); |
| 304 g_audio_manager = NULL; | 305 g_audio_manager = NULL; |
| 305 | 306 |
| 306 return 0; | 307 return 0; |
| 307 } | 308 } |
| OLD | NEW |