Chromium Code Reviews| 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 "content/public/common/media_stream_request.h" | |
| 9 #include "ipc/ipc_message_macros.h" | 10 #include "ipc/ipc_message_macros.h" |
| 10 #include "media/base/video_capture_types.h" | 11 #include "media/base/video_capture_types.h" |
| 11 #include "media/base/video_frame.h" | 12 #include "media/base/video_frame.h" |
| 12 #include "ui/gfx/gpu_memory_buffer.h" | 13 #include "ui/gfx/gpu_memory_buffer.h" |
| 13 | 14 |
| 14 #undef IPC_MESSAGE_EXPORT | 15 #undef IPC_MESSAGE_EXPORT |
| 15 #define IPC_MESSAGE_EXPORT CONTENT_EXPORT | 16 #define IPC_MESSAGE_EXPORT CONTENT_EXPORT |
| 16 #define IPC_MESSAGE_START VideoCaptureMsgStart | 17 #define IPC_MESSAGE_START VideoCaptureMsgStart |
| 17 | 18 |
| 18 IPC_ENUM_TRAITS_MAX_VALUE(content::VideoCaptureState, | 19 IPC_ENUM_TRAITS_MAX_VALUE(content::VideoCaptureState, |
| (...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 109 | 110 |
| 110 // Requests that the video capturer send a frame "soon" (e.g., to resolve | 111 // Requests that the video capturer send a frame "soon" (e.g., to resolve |
| 111 // picture loss or quality issues). | 112 // picture loss or quality issues). |
| 112 IPC_MESSAGE_CONTROL1(VideoCaptureHostMsg_RequestRefreshFrame, | 113 IPC_MESSAGE_CONTROL1(VideoCaptureHostMsg_RequestRefreshFrame, |
| 113 int /* device_id */) | 114 int /* device_id */) |
| 114 | 115 |
| 115 // Close the video capture specified by |device_id|. | 116 // Close the video capture specified by |device_id|. |
| 116 IPC_MESSAGE_CONTROL1(VideoCaptureHostMsg_Stop, | 117 IPC_MESSAGE_CONTROL1(VideoCaptureHostMsg_Stop, |
| 117 int /* device_id */) | 118 int /* device_id */) |
| 118 | 119 |
| 120 // Tell the browser process if the video capture is secure (i.e., all | |
| 121 // connected video sinks meet the requirement of output protection.). | |
| 122 IPC_MESSAGE_CONTROL3(VideoCaptureHostMsg_SetCapturingLinkSecured, | |
|
miu
2016/04/26 01:25:13
Hmm...It seems like this should be a MediaStreamHo
xjz
2016/04/29 00:11:42
The reason to use MediaStreamType here is that the
miu
2016/05/02 21:02:45
I should have explained more clearly before: What
xjz
2016/05/04 18:23:48
Thanks for the clear explanation! Changed the IPC
| |
| 123 content::MediaStreamType, /* type */ | |
| 124 int, /* session_id */ | |
| 125 bool /* is_secure */) | |
| 126 | |
| 119 // Tell the browser process that the renderer has finished reading from | 127 // Tell the browser process that the renderer has finished reading from |
| 120 // a buffer previously delivered by VideoCaptureMsg_BufferReady. | 128 // a buffer previously delivered by VideoCaptureMsg_BufferReady. |
| 121 IPC_MESSAGE_CONTROL4(VideoCaptureHostMsg_BufferReady, | 129 IPC_MESSAGE_CONTROL4(VideoCaptureHostMsg_BufferReady, |
| 122 int /* device_id */, | 130 int /* device_id */, |
| 123 int /* buffer_id */, | 131 int /* buffer_id */, |
| 124 gpu::SyncToken /* sync_token */, | 132 gpu::SyncToken /* sync_token */, |
| 125 double /* consumer_resource_utilization */) | 133 double /* consumer_resource_utilization */) |
| 126 | 134 |
| 127 // Get the formats supported by a device referenced by |capture_session_id|. | 135 // Get the formats supported by a device referenced by |capture_session_id|. |
| 128 IPC_MESSAGE_CONTROL2(VideoCaptureHostMsg_GetDeviceSupportedFormats, | 136 IPC_MESSAGE_CONTROL2(VideoCaptureHostMsg_GetDeviceSupportedFormats, |
| 129 int /* device_id */, | 137 int /* device_id */, |
| 130 media::VideoCaptureSessionId /* session_id */) | 138 media::VideoCaptureSessionId /* session_id */) |
| 131 | 139 |
| 132 // Get the format(s) in use by a device referenced by |capture_session_id|. | 140 // Get the format(s) in use by a device referenced by |capture_session_id|. |
| 133 IPC_MESSAGE_CONTROL2(VideoCaptureHostMsg_GetDeviceFormatsInUse, | 141 IPC_MESSAGE_CONTROL2(VideoCaptureHostMsg_GetDeviceFormatsInUse, |
| 134 int /* device_id */, | 142 int /* device_id */, |
| 135 media::VideoCaptureSessionId /* session_id */) | 143 media::VideoCaptureSessionId /* session_id */) |
| OLD | NEW |