OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "media/mojo/services/mojo_renderer_service.h" | 5 #include "media/mojo/services/mojo_renderer_service.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/callback_helpers.h" | 8 #include "base/callback_helpers.h" |
9 #include "base/memory/scoped_vector.h" | 9 #include "base/memory/scoped_vector.h" |
10 #include "base/message_loop/message_loop.h" | 10 #include "base/message_loop/message_loop.h" |
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
45 renderer_config->GetAudioDecoders(task_runner, | 45 renderer_config->GetAudioDecoders(task_runner, |
46 base::Bind(&MediaLog::AddLogEvent, | 46 base::Bind(&MediaLog::AddLogEvent, |
47 media_log)).Pass(), | 47 media_log)).Pass(), |
48 renderer_config->GetAudioHardwareConfig(), media_log)); | 48 renderer_config->GetAudioHardwareConfig(), media_log)); |
49 | 49 |
50 scoped_ptr<VideoRenderer> video_renderer(new VideoRendererImpl( | 50 scoped_ptr<VideoRenderer> video_renderer(new VideoRendererImpl( |
51 task_runner, video_renderer_sink_.get(), | 51 task_runner, video_renderer_sink_.get(), |
52 renderer_config->GetVideoDecoders(task_runner, | 52 renderer_config->GetVideoDecoders(task_runner, |
53 base::Bind(&MediaLog::AddLogEvent, | 53 base::Bind(&MediaLog::AddLogEvent, |
54 media_log)).Pass(), | 54 media_log)).Pass(), |
55 true, media_log)); | 55 true, nullptr, media_log)); |
56 | 56 |
57 // Create renderer. | 57 // Create renderer. |
58 renderer_.reset(new RendererImpl( | 58 renderer_.reset(new RendererImpl( |
59 task_runner, audio_renderer.Pass(), video_renderer.Pass())); | 59 task_runner, audio_renderer.Pass(), video_renderer.Pass())); |
60 } | 60 } |
61 | 61 |
62 MojoRendererService::~MojoRendererService() { | 62 MojoRendererService::~MojoRendererService() { |
63 } | 63 } |
64 | 64 |
65 void MojoRendererService::Initialize(mojo::MediaRendererClientPtr client, | 65 void MojoRendererService::Initialize(mojo::MediaRendererClientPtr client, |
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
179 } | 179 } |
180 | 180 |
181 void MojoRendererService::OnFlushCompleted(const mojo::Closure& callback) { | 181 void MojoRendererService::OnFlushCompleted(const mojo::Closure& callback) { |
182 DVLOG(1) << __FUNCTION__; | 182 DVLOG(1) << __FUNCTION__; |
183 DCHECK_EQ(state_, STATE_FLUSHING); | 183 DCHECK_EQ(state_, STATE_FLUSHING); |
184 state_ = STATE_PLAYING; | 184 state_ = STATE_PLAYING; |
185 callback.Run(); | 185 callback.Run(); |
186 } | 186 } |
187 | 187 |
188 } // namespace media | 188 } // namespace media |
OLD | NEW |