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

Side by Side Diff: remoting/host/ipc_desktop_environment.cc

Issue 11778049: Making DesktopEnvironment a factory class used by ClientSession to create audio/video capturers and… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: - Created 7 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 | Annotate | Revision Log
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/host/ipc_desktop_environment.h" 5 #include "remoting/host/ipc_desktop_environment.h"
6 6
7 #include <utility>
8
7 #include "base/callback.h" 9 #include "base/callback.h"
8 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
9 #include "base/logging.h" 11 #include "base/logging.h"
10 #include "base/platform_file.h"
11 #include "base/single_thread_task_runner.h" 12 #include "base/single_thread_task_runner.h"
12 #include "ipc/ipc_channel_proxy.h" 13 #include "ipc/ipc_channel_proxy.h"
13 #include "ipc/ipc_message_macros.h"
14 #include "remoting/capturer/capture_data.h"
15 #include "remoting/capturer/video_frame_capturer.h" 14 #include "remoting/capturer/video_frame_capturer.h"
16 #include "remoting/host/audio_capturer.h" 15 #include "remoting/host/audio_capturer.h"
17 #include "remoting/host/chromoting_messages.h" 16 #include "remoting/host/chromoting_messages.h"
18 #include "remoting/host/client_session.h"
19 #include "remoting/host/desktop_session_connector.h"
20 #include "remoting/host/desktop_session_proxy.h" 17 #include "remoting/host/desktop_session_proxy.h"
21 #include "remoting/host/event_executor.h" 18 #include "remoting/host/event_executor.h"
22 #include "remoting/host/ipc_audio_capturer.h"
23 #include "remoting/host/ipc_event_executor.h"
24 #include "remoting/host/ipc_video_frame_capturer.h"
25
26 #if defined(OS_WIN)
27 #include "base/win/scoped_handle.h"
28 #endif // defined(OS_WIN)
29 19
30 namespace remoting { 20 namespace remoting {
31 21
32 IpcDesktopEnvironment::IpcDesktopEnvironment( 22 IpcDesktopEnvironment::IpcDesktopEnvironment(
33 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner, 23 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner,
34 scoped_refptr<base::SingleThreadTaskRunner> network_task_runner, 24 const std::string& client_jid,
35 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner, 25 const base::Closure& disconnect_callback,
36 DesktopSessionConnector* desktop_session_connector, 26 base::WeakPtr<DesktopSessionConnector> desktop_session_connector)
37 scoped_refptr<DesktopSessionProxy> desktop_session_proxy) 27 : caller_task_runner_(caller_task_runner),
38 : DesktopEnvironment( 28 connected_(false),
39 scoped_ptr<AudioCapturer>(
40 new IpcAudioCapturer(desktop_session_proxy)),
41 scoped_ptr<EventExecutor>(
42 new IpcEventExecutor(desktop_session_proxy)),
43 scoped_ptr<VideoFrameCapturer>(
44 new IpcVideoFrameCapturer(desktop_session_proxy))),
45 network_task_runner_(network_task_runner),
46 desktop_session_connector_(desktop_session_connector), 29 desktop_session_connector_(desktop_session_connector),
47 desktop_session_proxy_(desktop_session_proxy), 30 desktop_session_proxy_(new DesktopSessionProxy(caller_task_runner,
48 connected_(false) { 31 client_jid,
32 disconnect_callback)) {
33 DCHECK(caller_task_runner_->BelongsToCurrentThread());
49 } 34 }
50 35
51 IpcDesktopEnvironment::~IpcDesktopEnvironment() { 36 IpcDesktopEnvironment::~IpcDesktopEnvironment() {
52 if (connected_) { 37 DCHECK(caller_task_runner_->BelongsToCurrentThread());
53 connected_ = false; 38
39 if (connected_ && desktop_session_connector_)
54 desktop_session_connector_->DisconnectTerminal(desktop_session_proxy_); 40 desktop_session_connector_->DisconnectTerminal(desktop_session_proxy_);
41 }
42
43 scoped_ptr<AudioCapturer> IpcDesktopEnvironment::CreateAudioCapturer(
44 scoped_refptr<base::SingleThreadTaskRunner> audio_task_runner) {
45 DCHECK(caller_task_runner_->BelongsToCurrentThread());
46
47 ConnectToDesktopSession();
48 return desktop_session_proxy_->CreateAudioCapturer(audio_task_runner);
49 }
50
51 scoped_ptr<EventExecutor> IpcDesktopEnvironment::CreateEventExecutor(
52 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner,
53 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) {
54 DCHECK(caller_task_runner_->BelongsToCurrentThread());
55
56 ConnectToDesktopSession();
57 return desktop_session_proxy_->CreateEventExecutor(input_task_runner,
58 ui_task_runner);
59 }
60
61 scoped_ptr<VideoFrameCapturer> IpcDesktopEnvironment::CreateVideoCapturer(
62 scoped_refptr<base::SingleThreadTaskRunner> capture_task_runner,
63 scoped_refptr<base::SingleThreadTaskRunner> encode_task_runner) {
64 DCHECK(caller_task_runner_->BelongsToCurrentThread());
65
66 ConnectToDesktopSession();
67 return desktop_session_proxy_->CreateVideoCapturer(capture_task_runner,
68 encode_task_runner);
69 }
70
71 void IpcDesktopEnvironment::ConnectToDesktopSession() {
72 DCHECK(caller_task_runner_->BelongsToCurrentThread());
73
74 if (!connected_) {
75 connected_ = true;
76 desktop_session_connector_->ConnectTerminal(desktop_session_proxy_);
55 } 77 }
56 } 78 }
57 79
58 void IpcDesktopEnvironment::Start( 80 IpcDesktopEnvironmentFactory::IpcDesktopEnvironmentFactory(
59 scoped_ptr<protocol::ClipboardStub> client_clipboard, 81 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner,
82 IPC::ChannelProxy* daemon_channel)
83 : caller_task_runner_(caller_task_runner),
84 daemon_channel_(daemon_channel),
85 connector_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
86 next_id_(0) {
87 }
88
89 IpcDesktopEnvironmentFactory::~IpcDesktopEnvironmentFactory() {
90 DCHECK(caller_task_runner_->BelongsToCurrentThread());
91 }
92
93 scoped_ptr<DesktopEnvironment> IpcDesktopEnvironmentFactory::Create(
60 const std::string& client_jid, 94 const std::string& client_jid,
61 const base::Closure& disconnect_callback) { 95 const base::Closure& disconnect_callback) {
62 DCHECK(network_task_runner_->BelongsToCurrentThread()); 96 DCHECK(caller_task_runner_->BelongsToCurrentThread());
63 DCHECK(!connected_);
64 97
65 desktop_session_proxy_->Initialize(client_jid, disconnect_callback); 98 return scoped_ptr<DesktopEnvironment>(new IpcDesktopEnvironment(
99 caller_task_runner_, client_jid, disconnect_callback,
100 connector_factory_.GetWeakPtr()));
101 }
66 102
67 // Register the proxy to receive AttachToDesktop() and DetachFromDesktop() 103 bool IpcDesktopEnvironmentFactory::SupportsAudioCapture() const {
68 // notifications. 104 DCHECK(caller_task_runner_->BelongsToCurrentThread());
69 connected_ = true;
70 desktop_session_connector_->ConnectTerminal(desktop_session_proxy_);
71 105
72 DesktopEnvironment::Start(client_clipboard.Pass(), client_jid, 106 return AudioCapturer::IsSupported();
73 disconnect_callback); 107 }
108
109 void IpcDesktopEnvironmentFactory::ConnectTerminal(
110 scoped_refptr<DesktopSessionProxy> desktop_session_proxy) {
111 DCHECK(caller_task_runner_->BelongsToCurrentThread());
112
113 int id = next_id_++;
114 bool inserted = active_connections_.insert(
115 std::make_pair(id, desktop_session_proxy)).second;
116 CHECK(inserted);
117
118 VLOG(1) << "Network: registered desktop environment " << id;
119 daemon_channel_->Send(new ChromotingNetworkHostMsg_ConnectTerminal(id));
120 }
121
122 void IpcDesktopEnvironmentFactory::DisconnectTerminal(
123 scoped_refptr<DesktopSessionProxy> desktop_session_proxy) {
124 DCHECK(caller_task_runner_->BelongsToCurrentThread());
125
126 ActiveConnectionsList::iterator i;
127 for (i = active_connections_.begin(); i != active_connections_.end(); ++i) {
128 if (i->second.get() == desktop_session_proxy.get())
129 break;
130 }
131
132 if (i != active_connections_.end()) {
133 int id = i->first;
134 active_connections_.erase(i);
135
136 VLOG(1) << "Network: unregistered desktop environment " << id;
137 daemon_channel_->Send(new ChromotingNetworkHostMsg_DisconnectTerminal(id));
138 }
139 }
140
141 void IpcDesktopEnvironmentFactory::OnDesktopSessionAgentAttached(
142 int terminal_id,
143 IPC::PlatformFileForTransit desktop_process,
144 IPC::PlatformFileForTransit desktop_pipe) {
145 if (!caller_task_runner_->BelongsToCurrentThread()) {
146 caller_task_runner_->PostTask(FROM_HERE, base::Bind(
147 &IpcDesktopEnvironmentFactory::OnDesktopSessionAgentAttached,
148 base::Unretained(this), terminal_id, desktop_process, desktop_pipe));
149 return;
150 }
151
152 ActiveConnectionsList::iterator i = active_connections_.find(terminal_id);
153 if (i != active_connections_.end()) {
154 i->second->DetachFromDesktop();
155 i->second->AttachToDesktop(desktop_process, desktop_pipe);
156 } else {
157 #if defined(OS_POSIX)
158 DCHECK(desktop_process.auto_close);
159 DCHECK(desktop_pipe.auto_close);
160
161 base::ClosePlatformFile(desktop_process.fd);
162 base::ClosePlatformFile(desktop_pipe.fd);
163 #elif defined(OS_WIN)
164 base::ClosePlatformFile(desktop_process);
165 #endif // defined(OS_WIN)
166 }
167 }
168
169 void IpcDesktopEnvironmentFactory::OnTerminalDisconnected(int terminal_id) {
170 if (!caller_task_runner_->BelongsToCurrentThread()) {
171 caller_task_runner_->PostTask(FROM_HERE, base::Bind(
172 &IpcDesktopEnvironmentFactory::OnTerminalDisconnected,
173 base::Unretained(this), terminal_id));
174 return;
175 }
176
177 ActiveConnectionsList::iterator i = active_connections_.find(terminal_id);
178 if (i != active_connections_.end()) {
179 scoped_refptr<DesktopSessionProxy> desktop_session_proxy = i->second;
180 active_connections_.erase(i);
181
182 // Disconnect the client session.
183 desktop_session_proxy->DisconnectSession();
184 }
74 } 185 }
75 186
76 } // namespace remoting 187 } // namespace remoting
OLDNEW
« no previous file with comments | « remoting/host/ipc_desktop_environment.h ('k') | remoting/host/ipc_desktop_environment_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698