Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(260)

Side by Side Diff: remoting/client/chromoting_client.cc

Issue 1559933003: Pass VideoRenderer interface to ConnectionToHost. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@move_frame_consumer
Patch Set: Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | remoting/protocol/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "remoting/client/chromoting_client.h" 5 #include "remoting/client/chromoting_client.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "remoting/base/capabilities.h" 9 #include "remoting/base/capabilities.h"
10 #include "remoting/client/audio_decode_scheduler.h" 10 #include "remoting/client/audio_decode_scheduler.h"
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 const std::string& host_jid, 60 const std::string& host_jid,
61 const std::string& capabilities) { 61 const std::string& capabilities) {
62 DCHECK(thread_checker_.CalledOnValidThread()); 62 DCHECK(thread_checker_.CalledOnValidThread());
63 DCHECK(!session_manager_); // Start must be called more than once. 63 DCHECK(!session_manager_); // Start must be called more than once.
64 64
65 host_jid_ = host_jid; 65 host_jid_ = host_jid;
66 local_capabilities_ = capabilities; 66 local_capabilities_ = capabilities;
67 67
68 connection_->set_client_stub(this); 68 connection_->set_client_stub(this);
69 connection_->set_clipboard_stub(this); 69 connection_->set_clipboard_stub(this);
70 connection_->set_video_stub(video_renderer_->GetVideoStub()); 70 connection_->set_video_renderer(video_renderer_);
71 connection_->set_audio_stub(audio_decode_scheduler_.get()); 71 connection_->set_audio_stub(audio_decode_scheduler_.get());
72 72
73 session_manager_.reset(new protocol::JingleSessionManager(signal_strategy)); 73 session_manager_.reset(new protocol::JingleSessionManager(signal_strategy));
74 74
75 if (!protocol_config_) 75 if (!protocol_config_)
76 protocol_config_ = protocol::CandidateSessionConfig::CreateDefault(); 76 protocol_config_ = protocol::CandidateSessionConfig::CreateDefault();
77 if (!audio_decode_scheduler_) 77 if (!audio_decode_scheduler_)
78 protocol_config_->DisableAudioChannel(); 78 protocol_config_->DisableAudioChannel();
79 session_manager_->set_protocol_config(std::move(protocol_config_)); 79 session_manager_->set_protocol_config(std::move(protocol_config_));
80 80
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
202 DCHECK(thread_checker_.CalledOnValidThread()); 202 DCHECK(thread_checker_.CalledOnValidThread());
203 connection_->Connect( 203 connection_->Connect(
204 session_manager_->Connect(host_jid_, std::move(authenticator_)), 204 session_manager_->Connect(host_jid_, std::move(authenticator_)),
205 transport_context_, this); 205 transport_context_, this);
206 } 206 }
207 207
208 void ChromotingClient::OnAuthenticated() { 208 void ChromotingClient::OnAuthenticated() {
209 DCHECK(thread_checker_.CalledOnValidThread()); 209 DCHECK(thread_checker_.CalledOnValidThread());
210 210
211 // Initialize the decoder. 211 // Initialize the decoder.
212 video_renderer_->OnSessionConfig(connection_->config());
213 if (connection_->config().is_audio_enabled()) 212 if (connection_->config().is_audio_enabled())
214 audio_decode_scheduler_->Initialize(connection_->config()); 213 audio_decode_scheduler_->Initialize(connection_->config());
215 } 214 }
216 215
217 void ChromotingClient::OnChannelsConnected() { 216 void ChromotingClient::OnChannelsConnected() {
218 DCHECK(thread_checker_.CalledOnValidThread()); 217 DCHECK(thread_checker_.CalledOnValidThread());
219 218
220 // Negotiate capabilities with the host. 219 // Negotiate capabilities with the host.
221 VLOG(1) << "Client capabilities: " << local_capabilities_; 220 VLOG(1) << "Client capabilities: " << local_capabilities_;
222 221
223 protocol::Capabilities capabilities; 222 protocol::Capabilities capabilities;
224 capabilities.set_capabilities(local_capabilities_); 223 capabilities.set_capabilities(local_capabilities_);
225 connection_->host_stub()->SetCapabilities(capabilities); 224 connection_->host_stub()->SetCapabilities(capabilities);
226 } 225 }
227 226
228 } // namespace remoting 227 } // namespace remoting
OLDNEW
« no previous file with comments | « no previous file | remoting/protocol/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698