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

Side by Side Diff: remoting/host/chromoting_messages.h

Issue 2050353002: Update webrtc::DesktopCapturer clients to implement OnCaptureResult(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: update Created 4 years, 6 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
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 #ifndef REMOTING_HOST_CHROMOTING_MESSAGES_H_ 5 #ifndef REMOTING_HOST_CHROMOTING_MESSAGES_H_
6 #define REMOTING_HOST_CHROMOTING_MESSAGES_H_ 6 #define REMOTING_HOST_CHROMOTING_MESSAGES_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include "base/memory/shared_memory_handle.h" 10 #include "base/memory/shared_memory_handle.h"
11 #include "ipc/ipc_platform_file.h" 11 #include "ipc/ipc_platform_file.h"
12 #include "net/base/ip_endpoint.h" 12 #include "net/base/ip_endpoint.h"
13 #include "remoting/host/chromoting_param_traits.h" 13 #include "remoting/host/chromoting_param_traits.h"
14 #include "remoting/host/screen_resolution.h" 14 #include "remoting/host/screen_resolution.h"
15 #include "remoting/protocol/errors.h" 15 #include "remoting/protocol/errors.h"
16 #include "remoting/protocol/transport.h" 16 #include "remoting/protocol/transport.h"
17 #include "third_party/webrtc/modules/desktop_capture/desktop_capturer.h"
17 #include "third_party/webrtc/modules/desktop_capture/desktop_geometry.h" 18 #include "third_party/webrtc/modules/desktop_capture/desktop_geometry.h"
18 19
19 #endif // REMOTING_HOST_CHROMOTING_MESSAGES_H_ 20 #endif // REMOTING_HOST_CHROMOTING_MESSAGES_H_
20 21
21 // Multiply-included message file, no traditional include guard. 22 // Multiply-included message file, no traditional include guard.
22 #include "ipc/ipc_message_macros.h" 23 #include "ipc/ipc_message_macros.h"
23 24
24 #define IPC_MESSAGE_START ChromotingMsgStart 25 #define IPC_MESSAGE_START ChromotingMsgStart
25 26
26 //----------------------------------------------------------------------------- 27 //-----------------------------------------------------------------------------
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
165 // Time spent in capture. Unit is in milliseconds. 166 // Time spent in capture. Unit is in milliseconds.
166 IPC_STRUCT_MEMBER(int64_t, capture_time_ms) 167 IPC_STRUCT_MEMBER(int64_t, capture_time_ms)
167 168
168 // Latest event timestamp supplied by the client for performance tracking. 169 // Latest event timestamp supplied by the client for performance tracking.
169 IPC_STRUCT_MEMBER(int64_t, latest_event_timestamp) 170 IPC_STRUCT_MEMBER(int64_t, latest_event_timestamp)
170 171
171 // DPI for this frame. 172 // DPI for this frame.
172 IPC_STRUCT_MEMBER(webrtc::DesktopVector, dpi) 173 IPC_STRUCT_MEMBER(webrtc::DesktopVector, dpi)
173 IPC_STRUCT_END() 174 IPC_STRUCT_END()
174 175
176 IPC_ENUM_TRAITS_MAX_VALUE(webrtc::DesktopCapturer::Result,
177 webrtc::DesktopCapturer::Result::ERROR_PERMANENT)
Jamie 2016/06/14 21:22:44 Relying on ERROR_PERMANENT as being the max value
Sergey Ulanov 2016/06/15 20:30:10 Done.
178
175 // Notifies the network process that a shared buffer has been created. 179 // Notifies the network process that a shared buffer has been created.
176 IPC_MESSAGE_CONTROL1(ChromotingDesktopNetworkMsg_CaptureCompleted, 180 IPC_MESSAGE_CONTROL2(ChromotingDesktopNetworkMsg_CaptureResult,
177 SerializedDesktopFrame /* frame */ ) 181 webrtc::DesktopCapturer::Result /* result */,
182 SerializedDesktopFrame /* frame */)
178 183
179 // Carries a cursor share update from the desktop session agent to the client. 184 // Carries a cursor share update from the desktop session agent to the client.
180 IPC_MESSAGE_CONTROL1(ChromotingDesktopNetworkMsg_MouseCursor, 185 IPC_MESSAGE_CONTROL1(ChromotingDesktopNetworkMsg_MouseCursor,
181 webrtc::MouseCursor /* cursor */ ) 186 webrtc::MouseCursor /* cursor */ )
182 187
183 // Carries a clipboard event from the desktop session agent to the client. 188 // Carries a clipboard event from the desktop session agent to the client.
184 // |serialized_event| is a serialized protocol::ClipboardEvent. 189 // |serialized_event| is a serialized protocol::ClipboardEvent.
185 IPC_MESSAGE_CONTROL1(ChromotingDesktopNetworkMsg_InjectClipboardEvent, 190 IPC_MESSAGE_CONTROL1(ChromotingDesktopNetworkMsg_InjectClipboardEvent,
186 std::string /* serialized_event */ ) 191 std::string /* serialized_event */ )
187 192
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
263 268
264 // The IPC channel path for this remote_security_key connection. This message 269 // The IPC channel path for this remote_security_key connection. This message
265 // is sent from the well-known IPC server channel. 270 // is sent from the well-known IPC server channel.
266 IPC_MESSAGE_CONTROL1(ChromotingNetworkToRemoteSecurityKeyMsg_ConnectionDetails, 271 IPC_MESSAGE_CONTROL1(ChromotingNetworkToRemoteSecurityKeyMsg_ConnectionDetails,
267 std::string /* IPC Server path */) 272 std::string /* IPC Server path */)
268 273
269 // The array of bytes representing a security key response from the remote 274 // The array of bytes representing a security key response from the remote
270 // client. This message is sent over the per-client IPC channel. 275 // client. This message is sent over the per-client IPC channel.
271 IPC_MESSAGE_CONTROL1(ChromotingNetworkToRemoteSecurityKeyMsg_Response, 276 IPC_MESSAGE_CONTROL1(ChromotingNetworkToRemoteSecurityKeyMsg_Response,
272 std::string /* response bytes */) 277 std::string /* response bytes */)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698