OLD | NEW |
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 "base/memory/shared_memory.h" | 5 #include "base/memory/shared_memory.h" |
6 #include "content/common/content_export.h" | 6 #include "content/common/content_export.h" |
7 #include "content/common/media/video_capture.h" | 7 #include "content/common/media/video_capture.h" |
8 #include "content/public/common/common_param_traits.h" | 8 #include "content/public/common/common_param_traits.h" |
9 #include "gpu/command_buffer/common/mailbox_holder.h" | 9 #include "gpu/command_buffer/common/mailbox_holder.h" |
10 #include "ipc/ipc_message_macros.h" | 10 #include "ipc/ipc_message_macros.h" |
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
109 int, /* device_id */ | 109 int, /* device_id */ |
110 media::VideoCaptureSessionId, /* session_id */ | 110 media::VideoCaptureSessionId, /* session_id */ |
111 media::VideoCaptureParams /* params */) | 111 media::VideoCaptureParams /* params */) |
112 | 112 |
113 // Close the video capture specified by |device_id|. | 113 // Close the video capture specified by |device_id|. |
114 IPC_MESSAGE_CONTROL1(VideoCaptureHostMsg_Stop, | 114 IPC_MESSAGE_CONTROL1(VideoCaptureHostMsg_Stop, |
115 int /* device_id */) | 115 int /* device_id */) |
116 | 116 |
117 // Tell the browser process that the renderer has finished reading from | 117 // Tell the browser process that the renderer has finished reading from |
118 // a buffer previously delivered by VideoCaptureMsg_BufferReady. | 118 // a buffer previously delivered by VideoCaptureMsg_BufferReady. |
119 IPC_MESSAGE_CONTROL4(VideoCaptureHostMsg_BufferReady, | 119 IPC_MESSAGE_CONTROL5(VideoCaptureHostMsg_BufferReady, |
120 int /* device_id */, | 120 int /* device_id */, |
121 int /* buffer_id */, | 121 int /* buffer_id */, |
122 uint32 /* syncpoint */, | 122 uint32 /* syncpoint */, |
| 123 gpu::SyncToken /* sync_token */, |
123 double /* consumer_resource_utilization */) | 124 double /* consumer_resource_utilization */) |
124 | 125 |
125 // Get the formats supported by a device referenced by |capture_session_id|. | 126 // Get the formats supported by a device referenced by |capture_session_id|. |
126 IPC_MESSAGE_CONTROL2(VideoCaptureHostMsg_GetDeviceSupportedFormats, | 127 IPC_MESSAGE_CONTROL2(VideoCaptureHostMsg_GetDeviceSupportedFormats, |
127 int /* device_id */, | 128 int /* device_id */, |
128 media::VideoCaptureSessionId /* session_id */) | 129 media::VideoCaptureSessionId /* session_id */) |
129 | 130 |
130 // Get the format(s) in use by a device referenced by |capture_session_id|. | 131 // Get the format(s) in use by a device referenced by |capture_session_id|. |
131 IPC_MESSAGE_CONTROL2(VideoCaptureHostMsg_GetDeviceFormatsInUse, | 132 IPC_MESSAGE_CONTROL2(VideoCaptureHostMsg_GetDeviceFormatsInUse, |
132 int /* device_id */, | 133 int /* device_id */, |
133 media::VideoCaptureSessionId /* session_id */) | 134 media::VideoCaptureSessionId /* session_id */) |
OLD | NEW |