| Index: ppapi/proxy/ppapi_messages.h
|
| diff --git a/ppapi/proxy/ppapi_messages.h b/ppapi/proxy/ppapi_messages.h
|
| index ce50c42423268cc31df1987cd8ae6903cfd213a3..49f8d3c86fbf44cf690205bc7bbb6563aebb4d5b 100644
|
| --- a/ppapi/proxy/ppapi_messages.h
|
| +++ b/ppapi/proxy/ppapi_messages.h
|
| @@ -44,6 +44,8 @@
|
|
|
| IPC_ENUM_TRAITS(PP_InputEvent_Type)
|
| IPC_ENUM_TRAITS(PP_InputEvent_MouseButton)
|
| +IPC_ENUM_TRAITS(PP_VideoDecoderConfig_Dev::Format)
|
| +IPC_ENUM_TRAITS(PP_VideoDecoderConfig_Dev::H264Profile)
|
| IPC_ENUM_TRAITS(PP_VideoDecodeError_Dev)
|
|
|
| IPC_STRUCT_TRAITS_BEGIN(PP_Point)
|
| @@ -89,6 +91,11 @@ IPC_STRUCT_TRAITS_BEGIN(ppapi::proxy::PPPVideoCapture_Buffer)
|
| IPC_STRUCT_TRAITS_MEMBER(size)
|
| IPC_STRUCT_TRAITS_END()
|
|
|
| +IPC_STRUCT_TRAITS_BEGIN(PP_VideoDecoderConfig_Dev)
|
| + IPC_STRUCT_TRAITS_MEMBER(format)
|
| + IPC_STRUCT_TRAITS_MEMBER(h264_profile)
|
| +IPC_STRUCT_TRAITS_END()
|
| +
|
| IPC_STRUCT_TRAITS_BEGIN(ppapi::Preferences)
|
| IPC_STRUCT_TRAITS_MEMBER(standard_font_family)
|
| IPC_STRUCT_TRAITS_MEMBER(fixed_font_family)
|
| @@ -1019,7 +1026,7 @@ IPC_MESSAGE_ROUTED1(PpapiHostMsg_PPBVideoCapture_StopCapture,
|
| IPC_SYNC_MESSAGE_ROUTED3_1(PpapiHostMsg_PPBVideoDecoder_Create,
|
| PP_Instance /* instance */,
|
| ppapi::HostResource /* context */,
|
| - std::vector<PP_VideoConfigElement> /* config */,
|
| + PP_VideoDecoderConfig_Dev /* config */,
|
| ppapi::HostResource /* result */)
|
| IPC_MESSAGE_ROUTED4(PpapiHostMsg_PPBVideoDecoder_Decode,
|
| ppapi::HostResource /* video_decoder */,
|
|
|