| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/shared_memory.h" | 5 #include "base/shared_memory.h" |
| 6 #include "content/common/content_export.h" |
| 6 #include "content/common/media/video_capture.h" | 7 #include "content/common/media/video_capture.h" |
| 7 #include "content/public/common/common_param_traits.h" | 8 #include "content/public/common/common_param_traits.h" |
| 8 #include "ipc/ipc_message_macros.h" | 9 #include "ipc/ipc_message_macros.h" |
| 9 #include "media/video/capture/video_capture_types.h" | 10 #include "media/video/capture/video_capture_types.h" |
| 10 | 11 |
| 12 #undef IPC_MESSAGE_EXPORT |
| 13 #define IPC_MESSAGE_EXPORT CONTENT_EXPORT |
| 11 #define IPC_MESSAGE_START VideoCaptureMsgStart | 14 #define IPC_MESSAGE_START VideoCaptureMsgStart |
| 12 | 15 |
| 13 IPC_ENUM_TRAITS(video_capture::State) | 16 IPC_ENUM_TRAITS(video_capture::State) |
| 14 | 17 |
| 15 IPC_STRUCT_TRAITS_BEGIN(media::VideoCaptureParams) | 18 IPC_STRUCT_TRAITS_BEGIN(media::VideoCaptureParams) |
| 16 IPC_STRUCT_TRAITS_MEMBER(width) | 19 IPC_STRUCT_TRAITS_MEMBER(width) |
| 17 IPC_STRUCT_TRAITS_MEMBER(height) | 20 IPC_STRUCT_TRAITS_MEMBER(height) |
| 18 IPC_STRUCT_TRAITS_MEMBER(frame_per_second) | 21 IPC_STRUCT_TRAITS_MEMBER(frame_per_second) |
| 19 IPC_STRUCT_TRAITS_MEMBER(session_id) | 22 IPC_STRUCT_TRAITS_MEMBER(session_id) |
| 20 IPC_STRUCT_TRAITS_END() | 23 IPC_STRUCT_TRAITS_END() |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 54 | 57 |
| 55 // Close the video capture specified by |device_id|. | 58 // Close the video capture specified by |device_id|. |
| 56 IPC_MESSAGE_CONTROL1(VideoCaptureHostMsg_Stop, | 59 IPC_MESSAGE_CONTROL1(VideoCaptureHostMsg_Stop, |
| 57 int /* device_id */) | 60 int /* device_id */) |
| 58 | 61 |
| 59 // Tell the browser process that the video frame buffer |handle| is ready for | 62 // Tell the browser process that the video frame buffer |handle| is ready for |
| 60 // device |device_id| to fill up. | 63 // device |device_id| to fill up. |
| 61 IPC_MESSAGE_CONTROL2(VideoCaptureHostMsg_BufferReady, | 64 IPC_MESSAGE_CONTROL2(VideoCaptureHostMsg_BufferReady, |
| 62 int /* device_id */, | 65 int /* device_id */, |
| 63 int /* buffer_id */) | 66 int /* buffer_id */) |
| OLD | NEW |