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

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

Issue 910343002: Decompose VideoRenderer from VideoStub. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix perf test Created 5 years, 10 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/client/plugin/pepper_video_renderer_2d.h » ('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 "base/bind.h" 7 #include "base/bind.h"
8 #include "remoting/base/capabilities.h" 8 #include "remoting/base/capabilities.h"
9 #include "remoting/client/audio_decode_scheduler.h" 9 #include "remoting/client/audio_decode_scheduler.h"
10 #include "remoting/client/audio_player.h" 10 #include "remoting/client/audio_player.h"
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 scoped_ptr<protocol::Authenticator> authenticator, 53 scoped_ptr<protocol::Authenticator> authenticator,
54 scoped_ptr<protocol::TransportFactory> transport_factory, 54 scoped_ptr<protocol::TransportFactory> transport_factory,
55 const std::string& host_jid, 55 const std::string& host_jid,
56 const std::string& capabilities) { 56 const std::string& capabilities) {
57 DCHECK(task_runner_->BelongsToCurrentThread()); 57 DCHECK(task_runner_->BelongsToCurrentThread());
58 58
59 local_capabilities_ = capabilities; 59 local_capabilities_ = capabilities;
60 60
61 connection_.set_client_stub(this); 61 connection_.set_client_stub(this);
62 connection_.set_clipboard_stub(this); 62 connection_.set_clipboard_stub(this);
63 connection_.set_video_stub(video_renderer_); 63 connection_.set_video_stub(video_renderer_->GetVideoStub());
64 connection_.set_audio_stub(audio_decode_scheduler_.get()); 64 connection_.set_audio_stub(audio_decode_scheduler_.get());
65 65
66 connection_.Connect(signal_strategy, transport_factory.Pass(), 66 connection_.Connect(signal_strategy, transport_factory.Pass(),
67 authenticator.Pass(), host_jid, this); 67 authenticator.Pass(), host_jid, this);
68 } 68 }
69 69
70 void ChromotingClient::SetCapabilities( 70 void ChromotingClient::SetCapabilities(
71 const protocol::Capabilities& capabilities) { 71 const protocol::Capabilities& capabilities) {
72 DCHECK(task_runner_->BelongsToCurrentThread()); 72 DCHECK(task_runner_->BelongsToCurrentThread());
73 73
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
158 158
159 // Negotiate capabilities with the host. 159 // Negotiate capabilities with the host.
160 VLOG(1) << "Client capabilities: " << local_capabilities_; 160 VLOG(1) << "Client capabilities: " << local_capabilities_;
161 161
162 protocol::Capabilities capabilities; 162 protocol::Capabilities capabilities;
163 capabilities.set_capabilities(local_capabilities_); 163 capabilities.set_capabilities(local_capabilities_);
164 connection_.host_stub()->SetCapabilities(capabilities); 164 connection_.host_stub()->SetCapabilities(capabilities);
165 } 165 }
166 166
167 } // namespace remoting 167 } // namespace remoting
OLDNEW
« no previous file with comments | « no previous file | remoting/client/plugin/pepper_video_renderer_2d.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698