diff options
Diffstat (limited to 'chromium/content/common/media/video_capture_messages.h')
| -rw-r--r-- | chromium/content/common/media/video_capture_messages.h | 44 |
1 files changed, 39 insertions, 5 deletions
diff --git a/chromium/content/common/media/video_capture_messages.h b/chromium/content/common/media/video_capture_messages.h index 55cbb38496d..c3970df76f8 100644 --- a/chromium/content/common/media/video_capture_messages.h +++ b/chromium/content/common/media/video_capture_messages.h @@ -6,6 +6,7 @@ #include "content/common/content_export.h" #include "content/common/media/video_capture.h" #include "content/public/common/common_param_traits.h" +#include "gpu/command_buffer/common/mailbox_holder.h" #include "ipc/ipc_message_macros.h" #include "media/video/capture/video_capture_types.h" @@ -13,7 +14,8 @@ #define IPC_MESSAGE_EXPORT CONTENT_EXPORT #define IPC_MESSAGE_START VideoCaptureMsgStart -IPC_ENUM_TRAITS(content::VideoCaptureState) +IPC_ENUM_TRAITS_MAX_VALUE(content::VideoCaptureState, + content::VIDEO_CAPTURE_STATE_LAST) IPC_STRUCT_TRAITS_BEGIN(media::VideoCaptureParams) IPC_STRUCT_TRAITS_MEMBER(requested_format) @@ -46,8 +48,29 @@ IPC_MESSAGE_CONTROL2(VideoCaptureMsg_FreeBuffer, IPC_MESSAGE_CONTROL4(VideoCaptureMsg_BufferReady, int /* device id */, int /* buffer_id */, - base::Time /* timestamp */, - media::VideoCaptureFormat /* resolution */) + media::VideoCaptureFormat /* format */, + base::TimeTicks /* timestamp */) + +// Tell the renderer process that a texture mailbox buffer is available from +// video capture. +IPC_MESSAGE_CONTROL5(VideoCaptureMsg_MailboxBufferReady, + int /* device_id */, + int /* buffer_id */, + gpu::MailboxHolder /* mailbox_holder */, + media::VideoCaptureFormat /* format */, + base::TimeTicks /* timestamp */) + +// Notify the renderer about a device's supported formats; this is a response +// to a VideoCaptureHostMsg_GetDeviceSupportedFormats request. +IPC_MESSAGE_CONTROL2(VideoCaptureMsg_DeviceSupportedFormatsEnumerated, + int /* device_id */, + media::VideoCaptureFormats /* supported_formats */) + +// Notify the renderer about a device's format(s) in use; this is a response +// to a VideoCaptureHostMsg_GetDeviceFormatInUse request. +IPC_MESSAGE_CONTROL2(VideoCaptureMsg_DeviceFormatsInUseReceived, + int /* device_id */, + media::VideoCaptureFormats /* formats_in_use */) // Start a video capture as |device_id|, a new id picked by the renderer // process. The session to be started is determined by |params.session_id|. @@ -66,6 +89,17 @@ IPC_MESSAGE_CONTROL1(VideoCaptureHostMsg_Stop, // Tell the browser process that the renderer has finished reading from // a buffer previously delivered by VideoCaptureMsg_BufferReady. -IPC_MESSAGE_CONTROL2(VideoCaptureHostMsg_BufferReady, +IPC_MESSAGE_CONTROL3(VideoCaptureHostMsg_BufferReady, int /* device_id */, - int /* buffer_id */) + int /* buffer_id */, + std::vector<uint32> /* syncpoints */) + +// Get the formats supported by a device referenced by |capture_session_id|. +IPC_MESSAGE_CONTROL2(VideoCaptureHostMsg_GetDeviceSupportedFormats, + int /* device_id */, + media::VideoCaptureSessionId /* session_id */) + +// Get the format(s) in use by a device referenced by |capture_session_id|. +IPC_MESSAGE_CONTROL2(VideoCaptureHostMsg_GetDeviceFormatsInUse, + int /* device_id */, + media::VideoCaptureSessionId /* session_id */) |