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 27 matching lines...) Expand all Loading... |
38 int /* length */, | 38 int /* length */, |
39 int /* buffer_id */) | 39 int /* buffer_id */) |
40 | 40 |
41 // Tell the renderer process that it should release a buffer previously | 41 // Tell the renderer process that it should release a buffer previously |
42 // allocated by VideoCaptureMsg_NewBuffer. | 42 // allocated by VideoCaptureMsg_NewBuffer. |
43 IPC_MESSAGE_CONTROL2(VideoCaptureMsg_FreeBuffer, | 43 IPC_MESSAGE_CONTROL2(VideoCaptureMsg_FreeBuffer, |
44 int /* device id */, | 44 int /* device id */, |
45 int /* buffer_id */) | 45 int /* buffer_id */) |
46 | 46 |
47 // Tell the renderer process that a buffer is available from video capture. | 47 // Tell the renderer process that a buffer is available from video capture. |
48 IPC_MESSAGE_CONTROL4(VideoCaptureMsg_BufferReady, | 48 IPC_MESSAGE_CONTROL5(VideoCaptureMsg_BufferReady, |
49 int /* device id */, | 49 int /* device id */, |
50 int /* buffer_id */, | 50 int /* buffer_id */, |
51 media::VideoCaptureFormat /* format */, | 51 media::VideoCaptureFormat /* format */, |
| 52 gfx::Rect /* visible_rect */, |
52 base::TimeTicks /* timestamp */) | 53 base::TimeTicks /* timestamp */) |
53 | 54 |
54 // Tell the renderer process that a texture mailbox buffer is available from | 55 // Tell the renderer process that a texture mailbox buffer is available from |
55 // video capture. | 56 // video capture. |
56 IPC_MESSAGE_CONTROL5(VideoCaptureMsg_MailboxBufferReady, | 57 IPC_MESSAGE_CONTROL5(VideoCaptureMsg_MailboxBufferReady, |
57 int /* device_id */, | 58 int /* device_id */, |
58 int /* buffer_id */, | 59 int /* buffer_id */, |
59 gpu::MailboxHolder /* mailbox_holder */, | 60 gpu::MailboxHolder /* mailbox_holder */, |
60 media::VideoCaptureFormat /* format */, | 61 media::VideoCaptureFormat /* format */, |
61 base::TimeTicks /* timestamp */) | 62 base::TimeTicks /* timestamp */) |
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
96 | 97 |
97 // Get the formats supported by a device referenced by |capture_session_id|. | 98 // Get the formats supported by a device referenced by |capture_session_id|. |
98 IPC_MESSAGE_CONTROL2(VideoCaptureHostMsg_GetDeviceSupportedFormats, | 99 IPC_MESSAGE_CONTROL2(VideoCaptureHostMsg_GetDeviceSupportedFormats, |
99 int /* device_id */, | 100 int /* device_id */, |
100 media::VideoCaptureSessionId /* session_id */) | 101 media::VideoCaptureSessionId /* session_id */) |
101 | 102 |
102 // Get the format(s) in use by a device referenced by |capture_session_id|. | 103 // Get the format(s) in use by a device referenced by |capture_session_id|. |
103 IPC_MESSAGE_CONTROL2(VideoCaptureHostMsg_GetDeviceFormatsInUse, | 104 IPC_MESSAGE_CONTROL2(VideoCaptureHostMsg_GetDeviceFormatsInUse, |
104 int /* device_id */, | 105 int /* device_id */, |
105 media::VideoCaptureSessionId /* session_id */) | 106 media::VideoCaptureSessionId /* session_id */) |
OLD | NEW |