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 "chromecast/renderer/media/audio_pipeline_proxy.h" | 5 #include "chromecast/renderer/media/audio_pipeline_proxy.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/bind_to_current_loop.h" |
8 #include "base/callback_helpers.h" | 9 #include "base/callback_helpers.h" |
9 #include "base/memory/shared_memory.h" | 10 #include "base/memory/shared_memory.h" |
10 #include "base/message_loop/message_loop.h" | 11 #include "base/message_loop/message_loop.h" |
11 #include "base/threading/thread_checker.h" | 12 #include "base/threading/thread_checker.h" |
12 #include "chromecast/common/media/cma_messages.h" | 13 #include "chromecast/common/media/cma_messages.h" |
13 #include "chromecast/common/media/shared_memory_chunk.h" | 14 #include "chromecast/common/media/shared_memory_chunk.h" |
14 #include "chromecast/media/cma/base/buffering_defs.h" | 15 #include "chromecast/media/cma/base/buffering_defs.h" |
15 #include "chromecast/media/cma/base/cma_logging.h" | 16 #include "chromecast/media/cma/base/cma_logging.h" |
16 #include "chromecast/media/cma/base/coded_frame_provider.h" | 17 #include "chromecast/media/cma/base/coded_frame_provider.h" |
17 #include "chromecast/media/cma/ipc/media_message_fifo.h" | 18 #include "chromecast/media/cma/ipc/media_message_fifo.h" |
18 #include "chromecast/media/cma/ipc_streamer/av_streamer_proxy.h" | 19 #include "chromecast/media/cma/ipc_streamer/av_streamer_proxy.h" |
19 #include "chromecast/media/cma/pipeline/av_pipeline_client.h" | 20 #include "chromecast/media/cma/pipeline/av_pipeline_client.h" |
20 #include "chromecast/renderer/media/cma_message_filter_proxy.h" | 21 #include "chromecast/renderer/media/cma_message_filter_proxy.h" |
21 #include "chromecast/renderer/media/media_channel_proxy.h" | 22 #include "chromecast/renderer/media/media_channel_proxy.h" |
22 #include "media/base/bind_to_current_loop.h" | |
23 #include "media/base/pipeline_status.h" | 23 #include "media/base/pipeline_status.h" |
24 | 24 |
25 namespace chromecast { | 25 namespace chromecast { |
26 namespace media { | 26 namespace media { |
27 | 27 |
28 namespace { | 28 namespace { |
29 | 29 |
30 void IgnoreResult() { | 30 void IgnoreResult() { |
31 } | 31 } |
32 | 32 |
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
219 DCHECK(thread_checker_.CalledOnValidThread()); | 219 DCHECK(thread_checker_.CalledOnValidThread()); |
220 // Release the underlying object on the right thread. | 220 // Release the underlying object on the right thread. |
221 io_message_loop_proxy_->PostTask( | 221 io_message_loop_proxy_->PostTask( |
222 FROM_HERE, | 222 FROM_HERE, |
223 base::Bind(&AudioPipelineProxyInternal::Release, base::Passed(&proxy_))); | 223 base::Bind(&AudioPipelineProxyInternal::Release, base::Passed(&proxy_))); |
224 } | 224 } |
225 | 225 |
226 void AudioPipelineProxy::SetClient( | 226 void AudioPipelineProxy::SetClient( |
227 const AvPipelineClient& client) { | 227 const AvPipelineClient& client) { |
228 DCHECK(thread_checker_.CalledOnValidThread()); | 228 DCHECK(thread_checker_.CalledOnValidThread()); |
229 base::Closure pipe_read_cb = ::media::BindToCurrentLoop( | 229 base::Closure pipe_read_cb = base::BindToCurrentLoop( |
230 base::Bind(&AudioPipelineProxy::OnPipeRead, weak_this_)); | 230 base::Bind(&AudioPipelineProxy::OnPipeRead, weak_this_)); |
231 FORWARD_ON_IO_THREAD(SetClient, pipe_read_cb, client); | 231 FORWARD_ON_IO_THREAD(SetClient, pipe_read_cb, client); |
232 } | 232 } |
233 | 233 |
234 void AudioPipelineProxy::Initialize( | 234 void AudioPipelineProxy::Initialize( |
235 const ::media::AudioDecoderConfig& config, | 235 const ::media::AudioDecoderConfig& config, |
236 scoped_ptr<CodedFrameProvider> frame_provider, | 236 scoped_ptr<CodedFrameProvider> frame_provider, |
237 const ::media::PipelineStatusCB& status_cb) { | 237 const ::media::PipelineStatusCB& status_cb) { |
238 CMALOG(kLogControl) << "AudioPipelineProxy::Initialize"; | 238 CMALOG(kLogControl) << "AudioPipelineProxy::Initialize"; |
239 DCHECK(thread_checker_.CalledOnValidThread()); | 239 DCHECK(thread_checker_.CalledOnValidThread()); |
240 audio_streamer_->SetCodedFrameProvider(frame_provider.Pass()); | 240 audio_streamer_->SetCodedFrameProvider(frame_provider.Pass()); |
241 | 241 |
242 AudioPipelineProxyInternal::SharedMemCB shared_mem_cb = | 242 AudioPipelineProxyInternal::SharedMemCB shared_mem_cb = |
243 ::media::BindToCurrentLoop(base::Bind( | 243 base::BindToCurrentLoop(base::Bind( |
244 &AudioPipelineProxy::OnAvPipeCreated, weak_this_, | 244 &AudioPipelineProxy::OnAvPipeCreated, weak_this_, |
245 config, status_cb)); | 245 config, status_cb)); |
246 FORWARD_ON_IO_THREAD(CreateAvPipe, shared_mem_cb); | 246 FORWARD_ON_IO_THREAD(CreateAvPipe, shared_mem_cb); |
247 } | 247 } |
248 | 248 |
249 void AudioPipelineProxy::OnAvPipeCreated( | 249 void AudioPipelineProxy::OnAvPipeCreated( |
250 const ::media::AudioDecoderConfig& config, | 250 const ::media::AudioDecoderConfig& config, |
251 const ::media::PipelineStatusCB& status_cb, | 251 const ::media::PipelineStatusCB& status_cb, |
252 scoped_ptr<base::SharedMemory> shared_memory) { | 252 scoped_ptr<base::SharedMemory> shared_memory) { |
253 CMALOG(kLogControl) << "AudioPipelineProxy::OnAvPipeCreated"; | 253 CMALOG(kLogControl) << "AudioPipelineProxy::OnAvPipeCreated"; |
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
300 DCHECK(thread_checker_.CalledOnValidThread()); | 300 DCHECK(thread_checker_.CalledOnValidThread()); |
301 FORWARD_ON_IO_THREAD(NotifyPipeWrite); | 301 FORWARD_ON_IO_THREAD(NotifyPipeWrite); |
302 } | 302 } |
303 | 303 |
304 void AudioPipelineProxy::OnPipeRead() { | 304 void AudioPipelineProxy::OnPipeRead() { |
305 DCHECK(thread_checker_.CalledOnValidThread()); | 305 DCHECK(thread_checker_.CalledOnValidThread()); |
306 if (audio_streamer_) | 306 if (audio_streamer_) |
307 audio_streamer_->OnFifoReadEvent(); | 307 audio_streamer_->OnFifoReadEvent(); |
308 } | 308 } |
309 | 309 |
310 } // namespace cma | 310 } // namespace media |
311 } // namespace chromecast | 311 } // namespace chromecast |
OLD | NEW |