Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(85)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ppapi/proxy/ppapi_messages.h

Issue 11274036: Refactor video capture to new design (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« ppapi/proxy/interface_list.cc ('K') | « ppapi/proxy/interface_list.cc ('k') | ppapi/proxy/ppb_video_capture_proxy.h » ('j') | ppapi/shared_impl/ppb_video_capture_shared.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ppapi/proxy/ppapi_messages.h
diff --git a/ppapi/proxy/ppapi_messages.h b/ppapi/proxy/ppapi_messages.h
index 361c19e3b24f487939be8242f7794a08d1bf9248..9e4c692fbe744fdf336fd7dabe52ab9a3c55e5fa 100644
--- a/ppapi/proxy/ppapi_messages.h
+++ b/ppapi/proxy/ppapi_messages.h
@@ -263,14 +263,7 @@ IPC_STRUCT_TRAITS_BEGIN(ppapi::NetworkInfo)
IPC_STRUCT_TRAITS_END()
#if !defined(OS_NACL) && !defined(NACL_WIN64)
-IPC_STRUCT_TRAITS_BEGIN(ppapi::proxy::PPPVideoCapture_Buffer)
- IPC_STRUCT_TRAITS_MEMBER(resource)
- IPC_STRUCT_TRAITS_MEMBER(handle)
- IPC_STRUCT_TRAITS_MEMBER(size)
-IPC_STRUCT_TRAITS_END()
-// TODO(tomfinegan): This is identical to PPPVideoCapture_Buffer, maybe replace
-// both with a single type?
IPC_STRUCT_TRAITS_BEGIN(ppapi::proxy::PPPDecryptor_Buffer)
IPC_STRUCT_TRAITS_MEMBER(resource)
IPC_STRUCT_TRAITS_MEMBER(handle)
@@ -760,31 +753,6 @@ IPC_SYNC_MESSAGE_ROUTED1_1(PpapiMsg_PPPInstancePrivate_GetInstanceObject,
PP_Instance /* instance */,
ppapi::proxy::SerializedVar /* result */)
-// PPB_VideoCapture_Dev
-IPC_MESSAGE_ROUTED3(PpapiMsg_PPBVideoCapture_EnumerateDevicesACK,
- ppapi::HostResource /* video_capture */,
- int32_t /* result */,
- std::vector<ppapi::DeviceRefData> /* devices */)
-IPC_MESSAGE_ROUTED2(PpapiMsg_PPBVideoCapture_OpenACK,
- ppapi::HostResource /* video_capture */,
- int32_t /* result */)
-
-// PPP_VideoCapture_Dev
-IPC_MESSAGE_ROUTED3(
- PpapiMsg_PPPVideoCapture_OnDeviceInfo,
- ppapi::HostResource /* video_capture */,
- PP_VideoCaptureDeviceInfo_Dev /* info */,
- std::vector<ppapi::proxy::PPPVideoCapture_Buffer> /* buffers */)
-IPC_MESSAGE_ROUTED2(PpapiMsg_PPPVideoCapture_OnStatus,
- ppapi::HostResource /* video_capture */,
- uint32_t /* status */)
-IPC_MESSAGE_ROUTED2(PpapiMsg_PPPVideoCapture_OnError,
- ppapi::HostResource /* video_capture */,
- uint32_t /* error_code */)
-IPC_MESSAGE_ROUTED2(PpapiMsg_PPPVideoCapture_OnBufferReady,
- ppapi::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,
@@ -1325,30 +1293,41 @@ IPC_MESSAGE_ROUTED2(PpapiHostMsg_PPBTesting_SimulateInputEvent,
ppapi::InputEventData /* input_event */)
#if !defined(OS_NACL) && !defined(NACL_WIN64)
-// PPB_VideoCapture_Dev.
-IPC_SYNC_MESSAGE_ROUTED1_1(PpapiHostMsg_PPBVideoCapture_Create,
- PP_Instance /* instance */,
- ppapi::HostResource /* result */)
-IPC_MESSAGE_ROUTED1(PpapiHostMsg_PPBVideoCapture_EnumerateDevices,
- ppapi::HostResource /* video_capture */)
-IPC_MESSAGE_ROUTED4(PpapiHostMsg_PPBVideoCapture_Open,
- ppapi::HostResource /* video_capture */,
- std::string /* device_id */,
- PP_VideoCaptureDeviceInfo_Dev /* requested_info */,
- uint32_t /* buffer_count */)
-IPC_MESSAGE_ROUTED1(PpapiHostMsg_PPBVideoCapture_StartCapture,
- ppapi::HostResource /* video_capture */)
-IPC_MESSAGE_ROUTED2(PpapiHostMsg_PPBVideoCapture_ReuseBuffer,
- ppapi::HostResource /* video_capture */,
- uint32_t /* buffer */)
-IPC_MESSAGE_ROUTED1(PpapiHostMsg_PPBVideoCapture_StopCapture,
- ppapi::HostResource /* video_capture */)
-IPC_MESSAGE_ROUTED1(PpapiHostMsg_PPBVideoCapture_Close,
- ppapi::HostResource /* video_capture */)
-IPC_MESSAGE_ROUTED3(PpapiHostMsg_PPBVideoCapture_StartCapture0_1,
- ppapi::HostResource /* video_capture */,
- PP_VideoCaptureDeviceInfo_Dev /* requested_info */,
- uint32_t /* buffer_count */)
+
+// VideoCapture_Dev, plugin -> host
yzshen1 2012/10/29 18:34:23 - nit, optional: The src/dest of those messages ar
victorhsieh 2012/10/30 09:43:28 Moved. And I'd keep those plugin->host comments,
+IPC_MESSAGE_CONTROL0(PpapiHostMsg_VideoCapture_Create)
+IPC_MESSAGE_CONTROL0(PpapiHostMsg_VideoCapture_StartCapture)
+IPC_MESSAGE_CONTROL1(PpapiHostMsg_VideoCapture_ReuseBuffer,
+ uint32_t /* buffer */)
+IPC_MESSAGE_CONTROL0(PpapiHostMsg_VideoCapture_StopCapture)
+IPC_MESSAGE_CONTROL0(PpapiHostMsg_VideoCapture_Close)
+IPC_MESSAGE_CONTROL2(PpapiHostMsg_VideoCapture_StartCapture0_1,
+ PP_VideoCaptureDeviceInfo_Dev /* requested_info */,
+ uint32_t /* buffer_count */)
+
+// VideoCapture_Dev, plugin -> host -> plugin
+IPC_MESSAGE_CONTROL0(PpapiHostMsg_VideoCapture_EnumerateDevices)
+IPC_MESSAGE_CONTROL2(PpapiPluginMsg_VideoCapture_EnumerateDevicesResponse,
yzshen1 2012/10/29 18:34:23 Please use *Reply, in order to be consistent with
victorhsieh 2012/10/30 09:43:28 Done.
+ int32_t /* result */,
yzshen1 2012/10/29 18:34:23 You don't need |result|. (Please see the reason be
victorhsieh 2012/10/30 09:43:28 Done.
+ std::vector<ppapi::DeviceRefData> /* devices */)
+IPC_MESSAGE_CONTROL3(PpapiHostMsg_VideoCapture_Open,
+ std::string /* device_id */,
+ PP_VideoCaptureDeviceInfo_Dev /* requested_info */,
+ uint32_t /* buffer_count */)
+IPC_MESSAGE_CONTROL1(PpapiPluginMsg_VideoCapture_OpenACK,
yzshen1 2012/10/29 18:34:23 Please use *Reply, in order to be consistent with
victorhsieh 2012/10/30 09:43:28 Done.
+ int32_t /* result */)
yzshen1 2012/10/29 18:34:23 You don't need this. The enclosing message has alr
victorhsieh 2012/10/30 09:43:28 Done.
+
+// VideoCapture_Dev, host -> plugin
+IPC_MESSAGE_CONTROL3(PpapiPluginMsg_VideoCapture_OnDeviceInfo,
+ PP_VideoCaptureDeviceInfo_Dev /* info */,
+ std::vector<ppapi::HostResource> /* buffers */,
+ uint32_t /* buffer_size */)
+IPC_MESSAGE_CONTROL1(PpapiPluginMsg_VideoCapture_OnStatus,
+ uint32_t /* status */)
+IPC_MESSAGE_CONTROL1(PpapiPluginMsg_VideoCapture_OnError,
+ uint32_t /* error */)
+IPC_MESSAGE_CONTROL1(PpapiPluginMsg_VideoCapture_OnBufferReady,
+ uint32_t /* buffer */)
// PPB_VideoDecoder.
IPC_SYNC_MESSAGE_ROUTED3_1(PpapiHostMsg_PPBVideoDecoder_Create,
« ppapi/proxy/interface_list.cc ('K') | « ppapi/proxy/interface_list.cc ('k') | ppapi/proxy/ppb_video_capture_proxy.h » ('j') | ppapi/shared_impl/ppb_video_capture_shared.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698