| 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" | |
| 10 #include "ipc/ipc_message_macros.h" | 9 #include "ipc/ipc_message_macros.h" |
| 11 #include "media/base/video_capture_types.h" | 10 #include "media/base/video_capture_types.h" |
| 12 #include "media/base/video_frame.h" | 11 #include "media/base/video_frame.h" |
| 13 #include "ui/gfx/gpu_memory_buffer.h" | 12 #include "ui/gfx/gpu_memory_buffer.h" |
| 14 | 13 |
| 15 #undef IPC_MESSAGE_EXPORT | 14 #undef IPC_MESSAGE_EXPORT |
| 16 #define IPC_MESSAGE_EXPORT CONTENT_EXPORT | 15 #define IPC_MESSAGE_EXPORT CONTENT_EXPORT |
| 17 #define IPC_MESSAGE_START VideoCaptureMsgStart | 16 #define IPC_MESSAGE_START VideoCaptureMsgStart |
| 18 | 17 |
| 19 IPC_ENUM_TRAITS_MAX_VALUE(content::VideoCaptureState, | 18 IPC_ENUM_TRAITS_MAX_VALUE(content::VideoCaptureState, |
| (...skipping 15 matching lines...) Expand all Loading... |
| 35 | 34 |
| 36 IPC_STRUCT_BEGIN(VideoCaptureMsg_BufferReady_Params) | 35 IPC_STRUCT_BEGIN(VideoCaptureMsg_BufferReady_Params) |
| 37 IPC_STRUCT_MEMBER(int, device_id) | 36 IPC_STRUCT_MEMBER(int, device_id) |
| 38 IPC_STRUCT_MEMBER(int, buffer_id) | 37 IPC_STRUCT_MEMBER(int, buffer_id) |
| 39 IPC_STRUCT_MEMBER(base::TimeTicks, timestamp) | 38 IPC_STRUCT_MEMBER(base::TimeTicks, timestamp) |
| 40 IPC_STRUCT_MEMBER(base::DictionaryValue, metadata) | 39 IPC_STRUCT_MEMBER(base::DictionaryValue, metadata) |
| 41 IPC_STRUCT_MEMBER(media::VideoPixelFormat, pixel_format) | 40 IPC_STRUCT_MEMBER(media::VideoPixelFormat, pixel_format) |
| 42 IPC_STRUCT_MEMBER(media::VideoFrame::StorageType, storage_type) | 41 IPC_STRUCT_MEMBER(media::VideoFrame::StorageType, storage_type) |
| 43 IPC_STRUCT_MEMBER(gfx::Size, coded_size) | 42 IPC_STRUCT_MEMBER(gfx::Size, coded_size) |
| 44 IPC_STRUCT_MEMBER(gfx::Rect, visible_rect) | 43 IPC_STRUCT_MEMBER(gfx::Rect, visible_rect) |
| 45 IPC_STRUCT_MEMBER(gpu::MailboxHolder, mailbox_holder) | |
| 46 IPC_STRUCT_END() | 44 IPC_STRUCT_END() |
| 47 | 45 |
| 48 // TODO(nick): device_id in these messages is basically just a route_id. We | 46 // TODO(nick): device_id in these messages is basically just a route_id. We |
| 49 // should shift to IPC_MESSAGE_ROUTED and use MessageRouter in the filter impls. | 47 // should shift to IPC_MESSAGE_ROUTED and use MessageRouter in the filter impls. |
| 50 | 48 |
| 51 // Notify the renderer process about the state update such as | 49 // Notify the renderer process about the state update such as |
| 52 // Start/Pause/Stop. | 50 // Start/Pause/Stop. |
| 53 IPC_MESSAGE_CONTROL2(VideoCaptureMsg_StateChanged, | 51 IPC_MESSAGE_CONTROL2(VideoCaptureMsg_StateChanged, |
| 54 int /* device id */, | 52 int /* device id */, |
| 55 content::VideoCaptureState /* new state */) | 53 content::VideoCaptureState /* new state */) |
| (...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 124 | 122 |
| 125 // Get the formats supported by a device referenced by |capture_session_id|. | 123 // Get the formats supported by a device referenced by |capture_session_id|. |
| 126 IPC_MESSAGE_CONTROL2(VideoCaptureHostMsg_GetDeviceSupportedFormats, | 124 IPC_MESSAGE_CONTROL2(VideoCaptureHostMsg_GetDeviceSupportedFormats, |
| 127 int /* device_id */, | 125 int /* device_id */, |
| 128 media::VideoCaptureSessionId /* session_id */) | 126 media::VideoCaptureSessionId /* session_id */) |
| 129 | 127 |
| 130 // Get the format(s) in use by a device referenced by |capture_session_id|. | 128 // Get the format(s) in use by a device referenced by |capture_session_id|. |
| 131 IPC_MESSAGE_CONTROL2(VideoCaptureHostMsg_GetDeviceFormatsInUse, | 129 IPC_MESSAGE_CONTROL2(VideoCaptureHostMsg_GetDeviceFormatsInUse, |
| 132 int /* device_id */, | 130 int /* device_id */, |
| 133 media::VideoCaptureSessionId /* session_id */) | 131 media::VideoCaptureSessionId /* session_id */) |
| OLD | NEW |