Index: ppapi/proxy/ppapi_messages.h |
diff --git a/ppapi/proxy/ppapi_messages.h b/ppapi/proxy/ppapi_messages.h |
index b039878526490395428118efba107486029b075f..05563045e6cb2151de46de11536a9cfc307ee669 100644 |
--- a/ppapi/proxy/ppapi_messages.h |
+++ b/ppapi/proxy/ppapi_messages.h |
@@ -18,6 +18,7 @@ |
#include "ipc/ipc_message_macros.h" |
#include "ipc/ipc_message_utils.h" |
#include "ipc/ipc_platform_file.h" |
+#include "ppapi/c/dev/pp_video_capture_dev.h" |
#include "ppapi/c/pp_bool.h" |
#include "ppapi/c/pp_file_info.h" |
#include "ppapi/c/pp_instance.h" |
@@ -71,6 +72,18 @@ IPC_STRUCT_TRAITS_BEGIN(PP_Picture_Dev) |
IPC_STRUCT_TRAITS_MEMBER(bitstream_buffer_id) |
IPC_STRUCT_TRAITS_END() |
+IPC_STRUCT_TRAITS_BEGIN(PP_VideoCaptureDeviceInfo_Dev) |
+ IPC_STRUCT_TRAITS_MEMBER(width) |
+ IPC_STRUCT_TRAITS_MEMBER(height) |
+ IPC_STRUCT_TRAITS_MEMBER(frames_per_second) |
+IPC_STRUCT_TRAITS_END() |
+ |
+IPC_STRUCT_TRAITS_BEGIN(pp::proxy::PPPVideoCapture_Buffer) |
+ IPC_STRUCT_TRAITS_MEMBER(resource) |
+ IPC_STRUCT_TRAITS_MEMBER(handle) |
+ IPC_STRUCT_TRAITS_MEMBER(size) |
+IPC_STRUCT_TRAITS_END() |
+ |
IPC_STRUCT_TRAITS_BEGIN(::ppapi::Preferences) |
IPC_STRUCT_TRAITS_MEMBER(standard_font_family) |
IPC_STRUCT_TRAITS_MEMBER(fixed_font_family) |
@@ -330,6 +343,22 @@ IPC_MESSAGE_ROUTED3(PpapiMsg_PPBURLLoader_ReadResponseBody_Ack, |
int32 /* result */, |
std::string /* data */) |
+// PPP_VideoCapture_Dev |
+IPC_MESSAGE_ROUTED3( |
+ PpapiMsg_PPPVideoCapture_OnDeviceInfo, |
+ pp::proxy::HostResource /* video_capture */, |
+ PP_VideoCaptureDeviceInfo_Dev /* info */, |
+ std::vector<pp::proxy::PPPVideoCapture_Buffer> /* buffers */) |
+IPC_MESSAGE_ROUTED2(PpapiMsg_PPPVideoCapture_OnStatus, |
+ pp::proxy::HostResource /* video_capture */, |
+ uint32_t /* status */) |
+IPC_MESSAGE_ROUTED2(PpapiMsg_PPPVideoCapture_OnError, |
+ pp::proxy::HostResource /* video_capture */, |
+ uint32_t /* error_code */) |
+IPC_MESSAGE_ROUTED2(PpapiMsg_PPPVideoCapture_OnBufferReady, |
+ pp::proxy::HostResource /* video_capture */, |
+ uint32_t /* buffer */) |
+ |
// PPB_VideoDecoder_Dev. |
// (Messages from renderer to plugin to notify it to run callbacks.) |
IPC_MESSAGE_ROUTED3(PpapiMsg_PPBVideoDecoder_EndOfBitstreamACK, |
@@ -945,6 +974,21 @@ IPC_SYNC_MESSAGE_ROUTED4_3(PpapiHostMsg_ResourceCreation_ImageData, |
pp::proxy::HostResource /* result_resource */, |
std::string /* image_data_desc */, |
pp::proxy::ImageHandle /* result */) |
+ |
+// PPB_VideoCapture_Dev. |
+IPC_SYNC_MESSAGE_ROUTED1_1(PpapiHostMsg_PPBVideoCapture_Create, |
+ PP_Instance /* instance */, |
+ pp::proxy::HostResource /* result */) |
+IPC_MESSAGE_ROUTED3(PpapiHostMsg_PPBVideoCapture_StartCapture, |
+ pp::proxy::HostResource /* video_capture */, |
+ PP_VideoCaptureDeviceInfo_Dev /* requested_info */, |
+ uint32_t /* buffer_count */) |
+IPC_MESSAGE_ROUTED2(PpapiHostMsg_PPBVideoCapture_ReuseBuffer, |
+ pp::proxy::HostResource /* video_capture */, |
+ uint32_t /* buffer */) |
+IPC_MESSAGE_ROUTED1(PpapiHostMsg_PPBVideoCapture_StopCapture, |
+ pp::proxy::HostResource /* video_capture */) |
+ |
// PPB_VideoDecoder. |
IPC_SYNC_MESSAGE_ROUTED3_1(PpapiHostMsg_PPBVideoDecoder_Create, |
PP_Instance /* instance */, |