Index: ppapi/proxy/ppapi_messages.h |
diff --git a/ppapi/proxy/ppapi_messages.h b/ppapi/proxy/ppapi_messages.h |
index 8d9abe6f553442dafcdb8d65537ac9db9103d374..edba5b399d91013a5037e3a5d15de4afd24b0852 100644 |
--- a/ppapi/proxy/ppapi_messages.h |
+++ b/ppapi/proxy/ppapi_messages.h |
@@ -1539,6 +1539,31 @@ IPC_SYNC_MESSAGE_CONTROL2_2(PpapiHostMsg_SharedMemory_CreateSharedMemory, |
int /* host_handle_id */, |
ppapi::proxy::SerializedHandle /* plugin_handle */) |
+// MediaStream ----------------------------------------------------------------- |
+ |
+// VideoDestination Private. |
+IPC_MESSAGE_CONTROL0(PpapiHostMsg_VideoDestination_Create) |
+IPC_MESSAGE_CONTROL1(PpapiHostMsg_VideoDestination_Open, |
+ std::string /* stream_url */) |
+IPC_MESSAGE_CONTROL0(PpapiPluginMsg_VideoDestination_OpenReply) |
+IPC_MESSAGE_CONTROL2(PpapiHostMsg_VideoDestination_PutFrame, |
+ ppapi::HostResource /* image_data */, |
+ PP_TimeTicks /* timestamp */) |
+IPC_MESSAGE_CONTROL0(PpapiHostMsg_VideoDestination_Close) |
+ |
+// VideoSource Private. |
+IPC_MESSAGE_CONTROL0(PpapiHostMsg_VideoSource_Create) |
+IPC_MESSAGE_CONTROL1(PpapiHostMsg_VideoSource_Open, |
+ std::string /* stream_url */) |
+IPC_MESSAGE_CONTROL0(PpapiPluginMsg_VideoSource_OpenReply) |
+IPC_MESSAGE_CONTROL0(PpapiHostMsg_VideoSource_GetFrame) |
+IPC_MESSAGE_CONTROL4(PpapiPluginMsg_VideoSource_GetFrameReply, |
+ ppapi::HostResource /* resource_id */, |
+ PP_ImageDataDesc /* image_data_desc */, |
+ int /* shmem_key */, |
+ PP_TimeTicks /* timestamp */) |
+IPC_MESSAGE_CONTROL0(PpapiHostMsg_VideoSource_Close) |
+ |
// WebSocket ------------------------------------------------------------------- |
IPC_MESSAGE_CONTROL0(PpapiHostMsg_WebSocket_Create) |
@@ -1877,29 +1902,4 @@ IPC_MESSAGE_CONTROL1(PpapiPluginMsg_VideoCapture_OnError, |
IPC_MESSAGE_CONTROL1(PpapiPluginMsg_VideoCapture_OnBufferReady, |
uint32_t /* buffer */) |
-// MediaStream ----------------------------------------------------------------- |
- |
-// VideoDestination Private. |
-IPC_MESSAGE_CONTROL0(PpapiHostMsg_VideoDestination_Create) |
-IPC_MESSAGE_CONTROL1(PpapiHostMsg_VideoDestination_Open, |
- std::string /* stream_url */) |
-IPC_MESSAGE_CONTROL0(PpapiPluginMsg_VideoDestination_OpenReply) |
-IPC_MESSAGE_CONTROL2(PpapiHostMsg_VideoDestination_PutFrame, |
- ppapi::HostResource /* image_data */, |
- PP_TimeTicks /* timestamp */) |
-IPC_MESSAGE_CONTROL0(PpapiHostMsg_VideoDestination_Close) |
- |
-// VideoSource Private. |
-IPC_MESSAGE_CONTROL0(PpapiHostMsg_VideoSource_Create) |
-IPC_MESSAGE_CONTROL1(PpapiHostMsg_VideoSource_Open, |
- std::string /* stream_url */) |
-IPC_MESSAGE_CONTROL0(PpapiPluginMsg_VideoSource_OpenReply) |
-IPC_MESSAGE_CONTROL0(PpapiHostMsg_VideoSource_GetFrame) |
-IPC_MESSAGE_CONTROL4(PpapiPluginMsg_VideoSource_GetFrameReply, |
- ppapi::HostResource /* resource_id */, |
- PP_ImageDataDesc /* image_data_desc */, |
- int /* fd */, |
- PP_TimeTicks /* timestamp */) |
-IPC_MESSAGE_CONTROL0(PpapiHostMsg_VideoSource_Close) |
- |
#endif // !defined(OS_NACL) && !defined(NACL_WIN64) |