OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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/remoting/remote_renderer_impl.h" | 5 #include "media/remoting/remote_renderer_impl.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 18 matching lines...) Expand all Loading... |
29 VideoRendererSink* video_renderer_sink) | 29 VideoRendererSink* video_renderer_sink) |
30 : state_(STATE_UNINITIALIZED), | 30 : state_(STATE_UNINITIALIZED), |
31 main_task_runner_(base::ThreadTaskRunnerHandle::Get()), | 31 main_task_runner_(base::ThreadTaskRunnerHandle::Get()), |
32 media_task_runner_(std::move(media_task_runner)), | 32 media_task_runner_(std::move(media_task_runner)), |
33 demuxer_stream_provider_(nullptr), | 33 demuxer_stream_provider_(nullptr), |
34 client_(nullptr), | 34 client_(nullptr), |
35 remoting_renderer_controller_(remoting_renderer_controller), | 35 remoting_renderer_controller_(remoting_renderer_controller), |
36 rpc_broker_(remoting_renderer_controller_->GetRpcBroker()), | 36 rpc_broker_(remoting_renderer_controller_->GetRpcBroker()), |
37 rpc_handle_(remoting::RpcBroker::GetUniqueHandle()), | 37 rpc_handle_(remoting::RpcBroker::GetUniqueHandle()), |
38 remote_renderer_handle_(remoting::kInvalidHandle), | 38 remote_renderer_handle_(remoting::kInvalidHandle), |
39 interstitial_ui_(video_renderer_sink, | 39 video_renderer_sink_(video_renderer_sink), |
40 remoting_renderer_controller->pipeline_metadata()), | |
41 weak_factory_(this) { | 40 weak_factory_(this) { |
42 VLOG(2) << __FUNCTION__; | 41 VLOG(2) << __FUNCTION__; |
43 // The constructor is running on the main thread. | 42 // The constructor is running on the main thread. |
44 DCHECK(remoting_renderer_controller); | 43 DCHECK(remoting_renderer_controller); |
45 | 44 |
46 UpdateInterstitial(); | 45 UpdateInterstitial(); |
47 | 46 |
48 const remoting::RpcBroker::ReceiveMessageCallback receive_callback = | 47 const remoting::RpcBroker::ReceiveMessageCallback receive_callback = |
49 base::Bind(&RemoteRendererImpl::OnMessageReceivedOnMainThread, | 48 base::Bind(&RemoteRendererImpl::OnMessageReceivedOnMainThread, |
50 media_task_runner_, weak_factory_.GetWeakPtr()); | 49 media_task_runner_, weak_factory_.GetWeakPtr()); |
(...skipping 520 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
571 | 570 |
572 if (!flush_cb_.is_null()) | 571 if (!flush_cb_.is_null()) |
573 base::ResetAndReturn(&flush_cb_).Run(); | 572 base::ResetAndReturn(&flush_cb_).Run(); |
574 | 573 |
575 // After OnError() returns, the pipeline may destroy |this|. | 574 // After OnError() returns, the pipeline may destroy |this|. |
576 client_->OnError(error); | 575 client_->OnError(error); |
577 } | 576 } |
578 | 577 |
579 void RemoteRendererImpl::UpdateInterstitial() { | 578 void RemoteRendererImpl::UpdateInterstitial() { |
580 DCHECK(main_task_runner_->BelongsToCurrentThread()); | 579 DCHECK(main_task_runner_->BelongsToCurrentThread()); |
| 580 if (!remoting_renderer_controller_) |
| 581 return; |
581 | 582 |
582 interstitial_ui_.ShowInterstitial( | 583 remoting_renderer_controller_->ShowInterstitial(video_renderer_sink_); |
583 remoting_renderer_controller_->remoting_source()->state() == | |
584 RemotingSessionState::SESSION_STARTED); | |
585 } | 584 } |
586 | 585 |
587 } // namespace media | 586 } // namespace media |
OLD | NEW |