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 "ipc/ipc_message_macros.h" | 9 #include "ipc/ipc_message_macros.h" |
10 #include "media/base/video_capture_types.h" | 10 #include "media/base/video_capture_types.h" |
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
52 | 52 |
53 // Tell the renderer process that a new buffer is allocated for video capture. | 53 // Tell the renderer process that a new buffer is allocated for video capture. |
54 IPC_MESSAGE_CONTROL4(VideoCaptureMsg_NewBuffer, | 54 IPC_MESSAGE_CONTROL4(VideoCaptureMsg_NewBuffer, |
55 int /* device id */, | 55 int /* device id */, |
56 base::SharedMemoryHandle /* handle */, | 56 base::SharedMemoryHandle /* handle */, |
57 int /* length */, | 57 int /* length */, |
58 int /* buffer_id */) | 58 int /* buffer_id */) |
59 | 59 |
60 // Tell the renderer process that a new GpuMemoryBuffer backed buffer is | 60 // Tell the renderer process that a new GpuMemoryBuffer backed buffer is |
61 // allocated for video capture. | 61 // allocated for video capture. |
62 IPC_MESSAGE_CONTROL4(VideoCaptureMsg_NewBuffer2, | 62 IPC_MESSAGE_CONTROL5(VideoCaptureMsg_NewBuffer2, |
63 int /* device id */, | 63 int /* device id */, |
64 std::vector<gfx::GpuMemoryBufferHandle> /* handles */, | 64 std::vector<gfx::GpuMemoryBufferHandle> /* handles */, |
65 gfx::Size /* dimensions */, | 65 gfx::Size /* dimensions */, |
| 66 media::VideoPixelFormat /*format*/, |
66 int /* buffer_id */) | 67 int /* buffer_id */) |
67 | 68 |
68 // Tell the renderer process that it should release a buffer previously | 69 // Tell the renderer process that it should release a buffer previously |
69 // allocated by VideoCaptureMsg_NewBuffer. | 70 // allocated by VideoCaptureMsg_NewBuffer. |
70 IPC_MESSAGE_CONTROL2(VideoCaptureMsg_FreeBuffer, | 71 IPC_MESSAGE_CONTROL2(VideoCaptureMsg_FreeBuffer, |
71 int /* device id */, | 72 int /* device id */, |
72 int /* buffer_id */) | 73 int /* buffer_id */) |
73 | 74 |
74 // Tell the renderer process that a Buffer is available from video capture, and | 75 // Tell the renderer process that a Buffer is available from video capture, and |
75 // send the associated VideoFrame constituient parts as IPC parameters. | 76 // send the associated VideoFrame constituient parts as IPC parameters. |
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
125 | 126 |
126 // Get the formats supported by a device referenced by |capture_session_id|. | 127 // Get the formats supported by a device referenced by |capture_session_id|. |
127 IPC_MESSAGE_CONTROL2(VideoCaptureHostMsg_GetDeviceSupportedFormats, | 128 IPC_MESSAGE_CONTROL2(VideoCaptureHostMsg_GetDeviceSupportedFormats, |
128 int /* device_id */, | 129 int /* device_id */, |
129 media::VideoCaptureSessionId /* session_id */) | 130 media::VideoCaptureSessionId /* session_id */) |
130 | 131 |
131 // Get the format(s) in use by a device referenced by |capture_session_id|. | 132 // Get the format(s) in use by a device referenced by |capture_session_id|. |
132 IPC_MESSAGE_CONTROL2(VideoCaptureHostMsg_GetDeviceFormatsInUse, | 133 IPC_MESSAGE_CONTROL2(VideoCaptureHostMsg_GetDeviceFormatsInUse, |
133 int /* device_id */, | 134 int /* device_id */, |
134 media::VideoCaptureSessionId /* session_id */) | 135 media::VideoCaptureSessionId /* session_id */) |
OLD | NEW |