Issue 11039012: Implement plugin side of sync EnumerateVideoCaptureDevices

Issue 11039012: Implement plugin side of sync EnumerateVideoCaptureDevices (Closed)

Created:
8 years, 2 months ago by raymes

Modified:
8 years, 2 months ago

Reviewers:
yzshen1

CC:
chromium-reviews, piman+watch_chromium.org, darin-cc_chromium.org, yusukes+watch_chromium.org, yzshen+watch_chromium.org, ihf+watch_chromium.org

Base URL:
svn://svn.chromium.org/chrome/trunk/src

Visibility:
Public.

More Reviews

Description

Implement plugin side of sync EnumerateVideoCaptureDevices This implements the plugin side of PPB_Flash::EnumerateVideoCaptureDevices which is a synchronous version of PPB_VideoCapture::EnumerateVideoDevices. The result is output into a PP_ArrayOutput. This also adds a unittest which does some basic testing of the messages sent, but mainly demonstrates how to write PluginResource unittests when dealing with sync messages (and adds some infrastructure to make it easy to do this). Once VideoCapture is implemented as a new-style resource, the code for this will simplify a lot. Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=161265

Patch Set 1 #

Patch Set 2 : . #

Patch Set 3 : . #

Total comments: 35

Patch Set 4 : . #

Patch Set 5 : . #

Total comments: 6

Patch Set 6 : . #

Patch Set 7 : . #

Patch Set 8 : . #

Patch Set 9 : . #

Patch Set 10 : . #

Patch Set 11 : . #

Total comments: 1

Patch Set 12 : . #

Patch Set 13 : . #

Patch Set 14 : . #

Created: 8 years, 2 months ago

Download [raw] [tar.bz2]

	Unified diffs	Side-by-side diffs	Delta from patch set	Stats (+684 lines, -10 lines)			Patch
M	ppapi/api/private/ppb_flash.idl	View	1 2 3 4 5 6	4 chunks	+24 lines, -4 lines	0 comments	Download
M	ppapi/c/private/ppb_flash.h	View	1 2 3 4 5 6	5 chunks	+55 lines, -4 lines	0 comments	Download
M	ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c	View	1 2 3 4 5 6 7 8 9 10 11 12 13	5 chunks	+134 lines, -0 lines	0 comments	Download
M	ppapi/ppapi_proxy.gypi	View	1 2 3 4 5 6 7 8 9 10 11 12 13	2 chunks	+3 lines, -0 lines	0 comments	Download
M	ppapi/ppapi_shared.gypi	View	1 2 3 4 5 6 7 8 9 10 11 12 13	1 chunk	+1 line, -0 lines	0 comments	Download
M	ppapi/ppapi_tests.gypi	View	1 2 3 4 5 6 7 8 9 10 11	1 chunk	+1 line, -0 lines	0 comments	Download
A	ppapi/proxy/flash_resource.h	View	1 2 3	1 chunk	+41 lines, -0 lines	0 comments	Download
A	ppapi/proxy/flash_resource.cc	View	1 2 3	1 chunk	+68 lines, -0 lines	0 comments	Download
A	ppapi/proxy/flash_resource_unittest.cc	View	1 2 3 4 5 6 7 8 9 10	1 chunk	+103 lines, -0 lines	0 comments	Download
M	ppapi/proxy/plugin_dispatcher.h	View	1 2	2 chunks	+4 lines, -1 line	0 comments	Download
M	ppapi/proxy/plugin_dispatcher.cc	View	1 2 3 4 5 6 7 8 9 10 11	1 chunk	+1 line, -0 lines	0 comments	Download
M	ppapi/proxy/ppapi_messages.h	View	1 2 3 4 5 6 7 8 9 10 11 12 13	1 chunk	+7 lines, -0 lines	0 comments	Download
M	ppapi/proxy/ppb_flash_proxy.h	View		1 chunk	+5 lines, -0 lines	0 comments	Download
M	ppapi/proxy/ppb_instance_proxy.h	View	1 2 3	1 chunk	+2 lines, -0 lines	0 comments	Download
M	ppapi/proxy/ppb_instance_proxy.cc	View	1 2 3 4 5 6 7 8 9 10 11 12	3 chunks	+24 lines, -0 lines	0 comments	Download
M	ppapi/proxy/resource_message_test_sink.h	View	1 2 3 4 5 6 7 8 9 10	3 chunks	+49 lines, -0 lines	0 comments	Download
M	ppapi/proxy/resource_message_test_sink.cc	View	1 2 3 4 5 6 7	2 chunks	+62 lines, -0 lines	0 comments	Download
M	ppapi/shared_impl/resource.h	View	1 2 3 4 5 6 7 8 9 10 11 12 13	1 chunk	+1 line, -0 lines	0 comments	Download
M	ppapi/thunk/interfaces_ppb_private_flash.h	View	1 2 3 4 5 6 7 8 9 10 11 12 13	1 chunk	+3 lines, -0 lines	0 comments	Download
M	ppapi/thunk/ppb_flash_api.h	View		1 chunk	+7 lines, -0 lines	0 comments	Download
A	ppapi/thunk/ppb_flash_functions_api.h	View	1 2 3	1 chunk	+32 lines, -0 lines	0 comments	Download
M	ppapi/thunk/ppb_flash_thunk.cc	View	1 2 3 4 5	5 chunks	+43 lines, -0 lines	0 comments	Download
M	ppapi/thunk/ppb_instance_api.h	View	1 2 3	2 chunks	+5 lines, -1 line	0 comments	Download
M	webkit/plugins/ppapi/ppapi_plugin_instance.h	View	1 2 3 4 5	2 chunks	+3 lines, -0 lines	0 comments	Download
M	webkit/plugins/ppapi/ppapi_plugin_instance.cc	View	1 2 3 4	1 chunk	+6 lines, -0 lines	0 comments	Download

Messages

Total messages: 10 (0 generated)

Expand Messages | Collapse Messages

yzshen1

http://codereview.chromium.org/11039012/diff/5001/ppapi/api/private/ppb_flash.idl File ppapi/api/private/ppb_flash.idl (right): http://codereview.chromium.org/11039012/diff/5001/ppapi/api/private/ppb_flash.idl#newcode259 ppapi/api/private/ppb_flash.idl:259: * ignores. The ref count of the returned |devices| ...

8 years, 2 months ago (2012-10-05 18:16:45 UTC) #2

raymes

https://codereview.chromium.org/11039012/diff/5001/ppapi/api/private/ppb_flash.idl File ppapi/api/private/ppb_flash.idl (right): https://codereview.chromium.org/11039012/diff/5001/ppapi/api/private/ppb_flash.idl#newcode259 ppapi/api/private/ppb_flash.idl:259: * ignores. The ref count of the returned |devices| ...

8 years, 2 months ago (2012-10-08 17:08:50 UTC) #3

yzshen1

https://codereview.chromium.org/11039012/diff/5001/ppapi/proxy/flash_resource_unittest.cc File ppapi/proxy/flash_resource_unittest.cc (right): https://codereview.chromium.org/11039012/diff/5001/ppapi/proxy/flash_resource_unittest.cc#newcode83 ppapi/proxy/flash_resource_unittest.cc:83: output.user_data = &device_ref_resources; On 2012/10/08 17:08:50, raymes wrote: > ...

8 years, 2 months ago (2012-10-08 19:44:25 UTC) #4

raymes

https://codereview.chromium.org/11039012/diff/5001/ppapi/proxy/ppapi_messages.h File ppapi/proxy/ppapi_messages.h (right): https://codereview.chromium.org/11039012/diff/5001/ppapi/proxy/ppapi_messages.h#newcode1586 ppapi/proxy/ppapi_messages.h:1586: // Flash functions. Thanks, as we discussed this was ...

8 years, 2 months ago (2012-10-08 20:06:10 UTC) #5

yzshen1

lgtm http://codereview.chromium.org/11039012/diff/12010/ppapi/proxy/ppb_instance_proxy.cc File ppapi/proxy/ppb_instance_proxy.cc (right): http://codereview.chromium.org/11039012/diff/12010/ppapi/proxy/ppb_instance_proxy.cc#newcode319 ppapi/proxy/ppb_instance_proxy.cc:319: #if !defined(OS_NACL) && !defined(NACL_WIN64) Please include build/build_config.h

8 years, 2 months ago (2012-10-09 17:17:46 UTC) #6

commit-bot: I haz the power

CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/raymes@chromium.org/11039012/16017

8 years, 2 months ago (2012-10-10 16:08:50 UTC) #7

commit-bot: I haz the power

Failed to apply patch for ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c: While running patch -p1 --forward --force --no-backup-if-mismatch; patching file ...

8 years, 2 months ago (2012-10-10 16:09:04 UTC) #8

Failed to apply patch for
ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c
  Hunk #1 FAILED at 3.
  Hunk #2 succeeded at 210 (offset 1 line).
  Hunk #3 succeeded at 2507 (offset 2 lines).
  Hunk #4 succeeded at 4041 (offset 4 lines).
  Hunk #5 succeeded at 4855 (offset 6 lines).
  Hunk #6 succeeded at 5126 (offset 12 lines).
  1 out of 6 hunks FAILED -- saving rejects to file
ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c.rej

Patch:       ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c
Index: ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c
diff --git a/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c
b/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c
index
75256bec86e0108af0cee38f8924f365778e0bed..bbf9ebcd3a6a0f4760aed7b3a96edd2549c62bc2
100644
--- a/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c
+++ b/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c
@@ -3,7 +3,7 @@
  * found in the LICENSE file.
  */
 
-/* Last generated from IDL: Mon Oct  8 10:50:14 2012. */
+/* Last generated from IDL: Mon Oct  8 15:31:49 2012. */
 #include "ppapi/generators/pnacl_shim.h"
 
 #include "ppapi/c/ppb.h"
@@ -209,6 +209,7 @@ static struct __PnaclWrapperInfo
Pnacl_WrapperInfo_PPB_Flash_12_2;
 static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Flash_12_3;
 static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Flash_12_4;
 static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Flash_12_5;
+static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Flash_12_6;
 static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Flash_Clipboard_3_0;
 static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Flash_Clipboard_4_0;
 static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Flash_DeviceID_1_0;
@@ -2504,6 +2505,112 @@ PP_Bool Pnacl_M22_PPB_Flash_SetCrashData(PP_Instance
instance, PP_FlashCrashKey
 
 /* End wrapper methods for PPB_Flash_12_5 */
 
+/* Begin wrapper methods for PPB_Flash_12_6 */
+
+static __attribute__((pnaclcall))
+void Pnacl_M24_PPB_Flash_SetInstanceAlwaysOnTop(PP_Instance instance, PP_Bool
on_top) {
+  const struct PPB_Flash_12_6 *iface =
Pnacl_WrapperInfo_PPB_Flash_12_6.real_iface;
+  iface->SetInstanceAlwaysOnTop(instance, on_top);
+}
+
+static __attribute__((pnaclcall))
+PP_Bool Pnacl_M24_PPB_Flash_DrawGlyphs(PP_Instance instance, PP_Resource
pp_image_data, const struct PP_FontDescription_Dev* font_desc, uint32_t color,
const struct PP_Point* position, const struct PP_Rect* clip, const float
transformation[3][3], PP_Bool allow_subpixel_aa, uint32_t glyph_count, const
uint16_t glyph_indices[], const struct PP_Point glyph_advances[]) {
+  const struct PPB_Flash_12_6 *iface =
Pnacl_WrapperInfo_PPB_Flash_12_6.real_iface;
+  return iface->DrawGlyphs(instance, pp_image_data, font_desc, color, position,
clip, transformation, allow_subpixel_aa, glyph_count, glyph_indices,
glyph_advances);
+}
+
+static __attribute__((pnaclcall))
+struct PP_Var Pnacl_M24_PPB_Flash_GetProxyForURL(PP_Instance instance, const
char* url) {
+  const struct PPB_Flash_12_6 *iface =
Pnacl_WrapperInfo_PPB_Flash_12_6.real_iface;
+  return iface->GetProxyForURL(instance, url);
+}
+
+static __attribute__((pnaclcall))
+int32_t Pnacl_M24_PPB_Flash_Navigate(PP_Resource request_info, const char*
target, PP_Bool from_user_action) {
+  const struct PPB_Flash_12_6 *iface =
Pnacl_WrapperInfo_PPB_Flash_12_6.real_iface;
+  return iface->Navigate(request_info, target, from_user_action);
+}
+
+static __attribute__((pnaclcall))
+void Pnacl_M24_PPB_Flash_RunMessageLoop(PP_Instance instance) {
+  const struct PPB_Flash_12_6 *iface =
Pnacl_WrapperInfo_PPB_Flash_12_6.real_iface;
+  iface->RunMessageLoop(instance);
+}
+
+static __attribute__((pnaclcall))
+void Pnacl_M24_PPB_Flash_QuitMessageLoop(PP_Instance instance) {
+  const struct PPB_Flash_12_6 *iface =
Pnacl_WrapperInfo_PPB_Flash_12_6.real_iface;
+  iface->QuitMessageLoop(instance);
+}
+
+static __attribute__((pnaclcall))
+double Pnacl_M24_PPB_Flash_GetLocalTimeZoneOffset(PP_Instance instance, PP_Time
t) {
+  const struct PPB_Flash_12_6 *iface =
Pnacl_WrapperInfo_PPB_Flash_12_6.real_iface;
+  return iface->GetLocalTimeZoneOffset(instance, t);
+}
+
+static __attribute__((pnaclcall))
+struct PP_Var Pnacl_M24_PPB_Flash_GetCommandLineArgs(PP_Module module) {
+  const struct PPB_Flash_12_6 *iface =
Pnacl_WrapperInfo_PPB_Flash_12_6.real_iface;
+  return iface->GetCommandLineArgs(module);
+}
+
+static __attribute__((pnaclcall))
+void Pnacl_M24_PPB_Flash_PreloadFontWin(const void* logfontw) {
+  const struct PPB_Flash_12_6 *iface =
Pnacl_WrapperInfo_PPB_Flash_12_6.real_iface;
+  iface->PreloadFontWin(logfontw);
+}
+
+static __attribute__((pnaclcall))
+PP_Bool Pnacl_M24_PPB_Flash_IsRectTopmost(PP_Instance instance, const struct
PP_Rect* rect) {
+  const struct PPB_Flash_12_6 *iface =
Pnacl_WrapperInfo_PPB_Flash_12_6.real_iface;
+  return iface->IsRectTopmost(instance, rect);
+}
+
+static __attribute__((pnaclcall))
+int32_t Pnacl_M24_PPB_Flash_InvokePrinting(PP_Instance instance) {
+  const struct PPB_Flash_12_6 *iface =
Pnacl_WrapperInfo_PPB_Flash_12_6.real_iface;
+  return iface->InvokePrinting(instance);
+}
+
+static __attribute__((pnaclcall))
+void Pnacl_M24_PPB_Flash_UpdateActivity(PP_Instance instance) {
+  const struct PPB_Flash_12_6 *iface =
Pnacl_WrapperInfo_PPB_Flash_12_6.real_iface;
+  iface->UpdateActivity(instance);
+}
+
+static __attribute__((pnaclcall))
+struct PP_Var Pnacl_M24_PPB_Flash_GetDeviceID(PP_Instance instance) {
+  const struct PPB_Flash_12_6 *iface =
Pnacl_WrapperInfo_PPB_Flash_12_6.real_iface;
+  return iface->GetDeviceID(instance);
+}
+
+static __attribute__((pnaclcall))
+int32_t Pnacl_M24_PPB_Flash_GetSettingInt(PP_Instance instance, PP_FlashSetting
setting) {
+  const struct PPB_Flash_12_6 *iface =
Pnacl_WrapperInfo_PPB_Flash_12_6.real_iface;
+  return iface->GetSettingInt(instance, setting);
+}
+
+static __attribute__((pnaclcall))
+struct PP_Var Pnacl_M24_PPB_Flash_GetSetting(PP_Instance instance,
PP_FlashSetting setting) {
+  const struct PPB_Flash_12_6 *iface =
Pnacl_WrapperInfo_PPB_Flash_12_6.real_iface;
+  return iface->GetSetting(instance, setting);
+}
+
+static __attribute__((pnaclcall))
+PP_Bool Pnacl_M24_PPB_Flash_SetCrashData(PP_Instance instance, PP_FlashCrashKey
key, struct PP_Var value) {
+  const struct PPB_Flash_12_6 *iface =
Pnacl_WrapperInfo_PPB_Flash_12_6.real_iface;
+  return iface->SetCrashData(instance, key, value);
+}
+
+static __attribute__((pnaclcall))
+int32_t Pnacl_M24_PPB_Flash_EnumerateVideoCaptureDevices(PP_Instance instance,
PP_Resource video_capture, struct PP_ArrayOutput devices) {
+  const struct PPB_Flash_12_6 *iface =
Pnacl_WrapperInfo_PPB_Flash_12_6.real_iface;
+  return iface->EnumerateVideoCaptureDevices(instance, video_capture, devices);
+}
+
+/* End wrapper methods for PPB_Flash_12_6 */
+
 /* Begin wrapper methods for PPB_Flash_Clipboard_3_0 */
 
 static __attribute__((pnaclcall))
@@ -3930,6 +4037,26 @@ struct PPB_Flash_12_5 Pnacl_Wrappers_PPB_Flash_12_5 = {
     .SetCrashData = (PP_Bool (*)(PP_Instance instance, PP_FlashCrashKey key,
struct PP_Var value))&Pnacl_M22_PPB_Flash_SetCrashData
 };
 
+struct PPB_Flash_12_6 Pnacl_Wrappers_PPB_Flash_12_6 = {
+    .SetInstanceAlwaysOnTop = (void (*)(PP_Instance instance, PP_Bool
on_top))&Pnacl_M24_PPB_Flash_SetInstanceAlwaysOnTop,
+    .DrawGlyphs = (PP_Bool (*)(PP_Instance instance, PP_Resource pp_image_data,
const struct PP_FontDescription_Dev* font_desc, uint32_t color, const struct
PP_Point* position, const struct PP_Rect* clip, const float
transformation[3][3], PP_Bool allow_subpixel_aa, uint32_t glyph_count, const
uint16_t glyph_indices[], const struct PP_Point
glyph_advances[]))&Pnacl_M24_PPB_Flash_DrawGlyphs,
+    .GetProxyForURL = (struct PP_Var (*)(PP_Instance instance, const char*
url))&Pnacl_M24_PPB_Flash_GetProxyForURL,
+    .Navigate = (int32_t (*)(PP_Resource request_info, const char* target,
PP_Bool from_user_action))&Pnacl_M24_PPB_Flash_Navigate,
+    .RunMessageLoop = (void (*)(PP_Instance
instance))&Pnacl_M24_PPB_Flash_RunMessageLoop,
+    .QuitMessageLoop = (void (*)(PP_Instance
instance))&Pnacl_M24_PPB_Flash_QuitMessageLoop,
+    .GetLocalTimeZoneOffset = (double (*)(PP_Instance instance, PP_Time
t))&Pnacl_M24_PPB_Flash_GetLocalTimeZoneOffset,
+    .GetCommandLineArgs = (struct PP_Var (*)(PP_Module
module))&Pnacl_M24_PPB_Flash_GetCommandLineArgs,
+    .PreloadFontWin = (void (*)(const void*
logfontw))&Pnacl_M24_PPB_Flash_PreloadFontWin,
+    .IsRectTopmost = (PP_Bool (*)(PP_Instance instance, const struct PP_Rect*
rect))&Pnacl_M24_PPB_Flash_IsRectTopmost,
+    .InvokePrinting = (int32_t (*)(PP_Instance
instance))&Pnacl_M24_PPB_Flash_InvokePrinting,
+    .UpdateActivity = (void (*)(PP_Instance
instance))&Pnacl_M24_PPB_Flash_UpdateActivity,
+    .GetDeviceID = (struct PP_Var (*)(PP_Instance
instance))&Pnacl_M24_PPB_Flash_GetDeviceID,
+    .GetSettingInt = (int32_t (*)(PP_Instance instance, PP_FlashSetting
setting))&Pnacl_M24_PPB_Flash_GetSettingInt,
+    .GetSetting = (struct PP_Var (*)(PP_Instance instance, PP_FlashSetting
setting))&Pnacl_M24_PPB_Flash_GetSetting,
+    .SetCrashData = (PP_Bool (*)(PP_Instance instance, PP_FlashCrashKey key,
struct PP_Var value))&Pnacl_M24_PPB_Flash_SetCrashData,
+    .EnumerateVideoCaptureDevices = (int32_t (*)(PP_Instance instance,
PP_Resource video_capture, struct PP_ArrayOutput
devices))&Pnacl_M24_PPB_Flash_EnumerateVideoCaptureDevices
+};
+
 struct PPB_Flash_Clipboard_3_0 Pnacl_Wrappers_PPB_Flash_Clipboard_3_0 = {
     .IsFormatAvailable = (PP_Bool (*)(PP_Instance instance_id,
PP_Flash_Clipboard_Type clipboard_type, PP_Flash_Clipboard_Format
format))&Pnacl_M17_PPB_Flash_Clipboard_IsFormatAvailable,
     .ReadPlainText = (struct PP_Var (*)(PP_Instance instance_id,
PP_Flash_Clipboard_Type c…
(message too large)

commit-bot: I haz the power

CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/raymes@chromium.org/11039012/24013

8 years, 2 months ago (2012-10-10 23:54:19 UTC) #9

Change committed as 161265

Expand Messages | Collapse Messages