| Index: content/common/media/video_capture_messages.h
|
| diff --git a/content/common/media/video_capture_messages.h b/content/common/media/video_capture_messages.h
|
| index 50e6f9a59b3b31619271f727ebba47d287f58881..c8bb16ebcea32d8376475d36d4d1275064d3af9b 100644
|
| --- a/content/common/media/video_capture_messages.h
|
| +++ b/content/common/media/video_capture_messages.h
|
| @@ -14,12 +14,22 @@
|
| #define IPC_MESSAGE_START VideoCaptureMsgStart
|
|
|
| IPC_ENUM_TRAITS(content::VideoCaptureState)
|
| -IPC_ENUM_TRAITS_MAX_VALUE(media::VideoCaptureResolutionType,
|
| - media::MaxVideoCaptureResolutionType - 1)
|
| +IPC_ENUM_TRAITS_MAX_VALUE(media::VideoPixelFormat, media::PIXEL_FORMAT_MAX - 1)
|
| +
|
| +IPC_STRUCT_TRAITS_BEGIN(media::VideoCaptureFormat)
|
| + IPC_STRUCT_TRAITS_MEMBER(frame_size)
|
| + IPC_STRUCT_TRAITS_MEMBER(frame_rate)
|
| + IPC_STRUCT_TRAITS_MEMBER(pixel_format)
|
| +IPC_STRUCT_TRAITS_END()
|
|
|
| IPC_STRUCT_TRAITS_BEGIN(media::VideoCaptureParams)
|
| IPC_STRUCT_TRAITS_MEMBER(session_id)
|
| IPC_STRUCT_TRAITS_MEMBER(requested_format)
|
| + IPC_STRUCT_TRAITS_MEMBER(allow_resolution_change)
|
| +IPC_STRUCT_TRAITS_END()
|
| +
|
| +IPC_STRUCT_TRAITS_BEGIN(media::VideoCaptureCapability)
|
| + IPC_STRUCT_TRAITS_MEMBER(supported_format)
|
| IPC_STRUCT_TRAITS_END()
|
|
|
| // TODO(nick): device_id in these messages is basically just a route_id. We
|
|
|