| 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/video/capture/video_capture_types.h" | 10 #include "media/video/capture/video_capture_types.h" |
| 11 | 11 |
| 12 #undef IPC_MESSAGE_EXPORT | 12 #undef IPC_MESSAGE_EXPORT |
| 13 #define IPC_MESSAGE_EXPORT CONTENT_EXPORT | 13 #define IPC_MESSAGE_EXPORT CONTENT_EXPORT |
| 14 #define IPC_MESSAGE_START VideoCaptureMsgStart | 14 #define IPC_MESSAGE_START VideoCaptureMsgStart |
| 15 | 15 |
| 16 IPC_ENUM_TRAITS(content::VideoCaptureState) | 16 IPC_ENUM_TRAITS(content::VideoCaptureState) |
| 17 | 17 |
| 18 IPC_STRUCT_TRAITS_BEGIN(media::VideoCaptureParams) | 18 IPC_STRUCT_TRAITS_BEGIN(media::VideoCaptureParams) |
| 19 IPC_STRUCT_TRAITS_MEMBER(requested_format) | 19 IPC_STRUCT_TRAITS_MEMBER(requested_format) |
| 20 IPC_STRUCT_TRAITS_MEMBER(allow_resolution_change) | 20 IPC_STRUCT_TRAITS_MEMBER(allow_resolution_change) |
| 21 IPC_STRUCT_TRAITS_END() | 21 IPC_STRUCT_TRAITS_END() |
| 22 | 22 |
| 23 IPC_STRUCT_TRAITS_BEGIN(media::VideoCaptureCapability) | |
| 24 IPC_STRUCT_TRAITS_MEMBER(supported_format) | |
| 25 IPC_STRUCT_TRAITS_END() | |
| 26 | |
| 27 // TODO(nick): device_id in these messages is basically just a route_id. We | 23 // TODO(nick): device_id in these messages is basically just a route_id. We |
| 28 // should shift to IPC_MESSAGE_ROUTED and use MessageRouter in the filter impls. | 24 // should shift to IPC_MESSAGE_ROUTED and use MessageRouter in the filter impls. |
| 29 | 25 |
| 30 // Notify the renderer process about the state update such as | 26 // Notify the renderer process about the state update such as |
| 31 // Start/Pause/Stop. | 27 // Start/Pause/Stop. |
| 32 IPC_MESSAGE_CONTROL2(VideoCaptureMsg_StateChanged, | 28 IPC_MESSAGE_CONTROL2(VideoCaptureMsg_StateChanged, |
| 33 int /* device id */, | 29 int /* device id */, |
| 34 content::VideoCaptureState /* new state */) | 30 content::VideoCaptureState /* new state */) |
| 35 | 31 |
| 36 // Tell the renderer process that a new buffer is allocated for video capture. | 32 // Tell the renderer process that a new buffer is allocated for video capture. |
| (...skipping 29 matching lines...) Expand all Loading... |
| 66 | 62 |
| 67 // Close the video capture specified by |device_id|. | 63 // Close the video capture specified by |device_id|. |
| 68 IPC_MESSAGE_CONTROL1(VideoCaptureHostMsg_Stop, | 64 IPC_MESSAGE_CONTROL1(VideoCaptureHostMsg_Stop, |
| 69 int /* device_id */) | 65 int /* device_id */) |
| 70 | 66 |
| 71 // Tell the browser process that the renderer has finished reading from | 67 // Tell the browser process that the renderer has finished reading from |
| 72 // a buffer previously delivered by VideoCaptureMsg_BufferReady. | 68 // a buffer previously delivered by VideoCaptureMsg_BufferReady. |
| 73 IPC_MESSAGE_CONTROL2(VideoCaptureHostMsg_BufferReady, | 69 IPC_MESSAGE_CONTROL2(VideoCaptureHostMsg_BufferReady, |
| 74 int /* device_id */, | 70 int /* device_id */, |
| 75 int /* buffer_id */) | 71 int /* buffer_id */) |
| OLD | NEW |