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

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

Issue 12047101: Move screen capturers from remoting/capturer to media/video/capturer/screen (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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 | Annotate | Revision Log
« no previous file with comments | « remoting/host/chromoting_host_unittest.cc ('k') | remoting/host/client_session.cc » ('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 #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 "ipc/ipc_platform_file.h" 8 #include "ipc/ipc_platform_file.h"
9 #include "remoting/capturer/mouse_cursor_shape.h" 9 #include "media/video/capture/screen/mouse_cursor_shape.h"
10 #include "third_party/skia/include/core/SkPoint.h" 10 #include "third_party/skia/include/core/SkPoint.h"
11 #include "third_party/skia/include/core/SkRect.h" 11 #include "third_party/skia/include/core/SkRect.h"
12 #include "third_party/skia/include/core/SkSize.h" 12 #include "third_party/skia/include/core/SkSize.h"
13 13
14 #endif // REMOTING_HOST_CHROMOTING_MESSAGES_H_ 14 #endif // REMOTING_HOST_CHROMOTING_MESSAGES_H_
15 15
16 // Multiply-included message file, no traditional include guard. 16 // Multiply-included message file, no traditional include guard.
17 #include "ipc/ipc_message_macros.h" 17 #include "ipc/ipc_message_macros.h"
18 18
19 #define IPC_MESSAGE_START ChromotingMsgStart 19 #define IPC_MESSAGE_START ChromotingMsgStart
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 IPC_STRUCT_TRAITS_MEMBER(fTop) 121 IPC_STRUCT_TRAITS_MEMBER(fTop)
122 IPC_STRUCT_TRAITS_MEMBER(fRight) 122 IPC_STRUCT_TRAITS_MEMBER(fRight)
123 IPC_STRUCT_TRAITS_MEMBER(fBottom) 123 IPC_STRUCT_TRAITS_MEMBER(fBottom)
124 IPC_STRUCT_TRAITS_END() 124 IPC_STRUCT_TRAITS_END()
125 125
126 IPC_STRUCT_TRAITS_BEGIN(SkISize) 126 IPC_STRUCT_TRAITS_BEGIN(SkISize)
127 IPC_STRUCT_TRAITS_MEMBER(fWidth) 127 IPC_STRUCT_TRAITS_MEMBER(fWidth)
128 IPC_STRUCT_TRAITS_MEMBER(fHeight) 128 IPC_STRUCT_TRAITS_MEMBER(fHeight)
129 IPC_STRUCT_TRAITS_END() 129 IPC_STRUCT_TRAITS_END()
130 130
131 IPC_STRUCT_TRAITS_BEGIN(remoting::MouseCursorShape) 131 IPC_STRUCT_TRAITS_BEGIN(media::MouseCursorShape)
132 IPC_STRUCT_TRAITS_MEMBER(size) 132 IPC_STRUCT_TRAITS_MEMBER(size)
133 IPC_STRUCT_TRAITS_MEMBER(hotspot) 133 IPC_STRUCT_TRAITS_MEMBER(hotspot)
134 IPC_STRUCT_TRAITS_MEMBER(data) 134 IPC_STRUCT_TRAITS_MEMBER(data)
135 IPC_STRUCT_TRAITS_END() 135 IPC_STRUCT_TRAITS_END()
136 136
137 // Serialized CaptureData structure. 137 // Serialized media::ScreenCaptureData structure.
138 IPC_STRUCT_BEGIN(SerializedCapturedData) 138 IPC_STRUCT_BEGIN(SerializedCapturedData)
139 // ID of the shared memory buffer containing the pixels. 139 // ID of the shared memory buffer containing the pixels.
140 IPC_STRUCT_MEMBER(int, shared_buffer_id) 140 IPC_STRUCT_MEMBER(int, shared_buffer_id)
141 141
142 // Width of a single row of pixels in bytes. 142 // Width of a single row of pixels in bytes.
143 IPC_STRUCT_MEMBER(int, bytes_per_row) 143 IPC_STRUCT_MEMBER(int, bytes_per_row)
144 144
145 // Captured region. 145 // Captured region.
146 IPC_STRUCT_MEMBER(std::vector<SkIRect>, dirty_region) 146 IPC_STRUCT_MEMBER(std::vector<SkIRect>, dirty_region)
147 147
148 // Dimentions of the buffer in pixels. 148 // Dimentions of the buffer in pixels.
149 IPC_STRUCT_MEMBER(SkISize, dimensions) 149 IPC_STRUCT_MEMBER(SkISize, dimensions)
150 150
151 // Time spent in capture. Unit is in milliseconds. 151 // Time spent in capture. Unit is in milliseconds.
152 IPC_STRUCT_MEMBER(int, capture_time_ms) 152 IPC_STRUCT_MEMBER(int, capture_time_ms)
153 153
154 // Sequence number supplied by client for performance tracking. 154 // Sequence number supplied by client for performance tracking.
155 IPC_STRUCT_MEMBER(int64, client_sequence_number) 155 IPC_STRUCT_MEMBER(int64, client_sequence_number)
156 156
157 // DPI for this frame. 157 // DPI for this frame.
158 IPC_STRUCT_MEMBER(SkIPoint, dpi) 158 IPC_STRUCT_MEMBER(SkIPoint, dpi)
159 IPC_STRUCT_END() 159 IPC_STRUCT_END()
160 160
161 // Notifies the network process that a shared buffer has been created. 161 // Notifies the network process that a shared buffer has been created.
162 IPC_MESSAGE_CONTROL1(ChromotingDesktopNetworkMsg_CaptureCompleted, 162 IPC_MESSAGE_CONTROL1(ChromotingDesktopNetworkMsg_CaptureCompleted,
163 SerializedCapturedData /* capture_data */ ) 163 SerializedCapturedData /* capture_data */ )
164 164
165 // Carries a cursor share update from the desktop session agent to the client. 165 // Carries a cursor share update from the desktop session agent to the client.
166 IPC_MESSAGE_CONTROL1(ChromotingDesktopNetworkMsg_CursorShapeChanged, 166 IPC_MESSAGE_CONTROL1(ChromotingDesktopNetworkMsg_CursorShapeChanged,
167 remoting::MouseCursorShape /* cursor_shape */ ) 167 media::MouseCursorShape /* cursor_shape */ )
168 168
169 // Carries a clipboard event from the desktop session agent to the client. 169 // Carries a clipboard event from the desktop session agent to the client.
170 // |serialized_event| is a serialized protocol::ClipboardEvent. 170 // |serialized_event| is a serialized protocol::ClipboardEvent.
171 IPC_MESSAGE_CONTROL1(ChromotingDesktopNetworkMsg_InjectClipboardEvent, 171 IPC_MESSAGE_CONTROL1(ChromotingDesktopNetworkMsg_InjectClipboardEvent,
172 std::string /* serialized_event */ ) 172 std::string /* serialized_event */ )
173 173
174 // Requests the network process to terminate the client session. 174 // Requests the network process to terminate the client session.
175 IPC_MESSAGE_CONTROL0(ChromotingDesktopNetworkMsg_DisconnectSession) 175 IPC_MESSAGE_CONTROL0(ChromotingDesktopNetworkMsg_DisconnectSession)
176 176
177 // Carries an audio packet from the desktop session agent to the client. 177 // Carries an audio packet from the desktop session agent to the client.
(...skipping 27 matching lines...) Expand all
205 205
206 // Carries a keyboard event from the client to the desktop session agent. 206 // Carries a keyboard event from the client to the desktop session agent.
207 // |serialized_event| is a serialized protocol::KeyEvent. 207 // |serialized_event| is a serialized protocol::KeyEvent.
208 IPC_MESSAGE_CONTROL1(ChromotingNetworkDesktopMsg_InjectKeyEvent, 208 IPC_MESSAGE_CONTROL1(ChromotingNetworkDesktopMsg_InjectKeyEvent,
209 std::string /* serialized_event */ ) 209 std::string /* serialized_event */ )
210 210
211 // Carries a mouse event from the client to the desktop session agent. 211 // Carries a mouse event from the client to the desktop session agent.
212 // |serialized_event| is a serialized protocol::MouseEvent. 212 // |serialized_event| is a serialized protocol::MouseEvent.
213 IPC_MESSAGE_CONTROL1(ChromotingNetworkDesktopMsg_InjectMouseEvent, 213 IPC_MESSAGE_CONTROL1(ChromotingNetworkDesktopMsg_InjectMouseEvent,
214 std::string /* serialized_event */ ) 214 std::string /* serialized_event */ )
OLDNEW
« no previous file with comments | « remoting/host/chromoting_host_unittest.cc ('k') | remoting/host/client_session.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698