Implement host side of sync EnumerateVideoCaptureDevices

ppapi/cpp/private/flash.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ppapi/cpp/private/flash.h"
 
 #include <string.h>
 
 #include "ppapi/c/pp_bool.h"
 #include "ppapi/c/pp_errors.h"
+#include "ppapi/cpp/dev/device_ref_dev.h"
 #include "ppapi/cpp/dev/font_dev.h"
+#include "ppapi/cpp/dev/video_capture_dev.h"
 #include "ppapi/cpp/image_data.h"
 #include "ppapi/cpp/instance_handle.h"
 #include "ppapi/cpp/module.h"
 #include "ppapi/cpp/module_impl.h"
 #include "ppapi/cpp/point.h"
 #include "ppapi/cpp/rect.h"
 #include "ppapi/cpp/url_request_info.h"
 #include "ppapi/cpp/var.h"
 #include "ppapi/c/private/ppb_flash.h"
 #include "ppapi/c/private/ppb_flash_print.h"
 
 namespace pp {
 
 namespace {
 
+template <> const char* interface_name<PPB_Flash_12_6>() {
+  return PPB_FLASH_INTERFACE_12_6;
+}
+
 template <> const char* interface_name<PPB_Flash_12_5>() {
   return PPB_FLASH_INTERFACE_12_5;
 }
 
 template <> const char* interface_name<PPB_Flash_12_4>() {
   return PPB_FLASH_INTERFACE_12_4;
 }
 
 template <> const char* interface_name<PPB_Flash_12_3>() {
   return PPB_FLASH_INTERFACE_12_3;
 }
 
 template <> const char* interface_name<PPB_Flash_Print_1_0>() {
   return PPB_FLASH_PRINT_INTERFACE_1_0;
 }
 
 // The combined Flash interface is all Flash v12.* interfaces. All v12
 // interfaces just append one or more functions to the previous one, so we can
 // have this meta one at the most recent version. Function pointers will be
 // null if they're not supported on the current Chrome version.
 bool initialized_combined_interface = false;
 PPB_Flash flash_12_combined_interface;
 
 // Makes sure that the most recent version is loaded into the combined
 // interface struct above. Any unsupported functions will be NULL. If there
 // is no Flash interface supported, all functions will be NULL.
 void InitializeCombinedInterface() {
   if (initialized_combined_interface)
     return;
   if (has_interface<PPB_Flash_12_5>()) {

[yzshen1, 2012/10/10 18:17:39]

Haha! Please use 12_6. :)

[raymes, 2012/10/11 18:39:26]

Good catch, thanks.

+    memcpy(&flash_12_combined_interface, get_interface<PPB_Flash_12_6>(),
+           sizeof(PPB_Flash_12_6));
+  } else if (has_interface<PPB_Flash_12_5>()) {
     memcpy(&flash_12_combined_interface, get_interface<PPB_Flash_12_5>(),
            sizeof(PPB_Flash_12_5));
   } else if (has_interface<PPB_Flash_12_4>()) {
     memcpy(&flash_12_combined_interface, get_interface<PPB_Flash_12_4>(),
            sizeof(PPB_Flash_12_4));
   } else if (has_interface<PPB_Flash_12_3>()) {
     memcpy(&flash_12_combined_interface, get_interface<PPB_Flash_12_3>(),
            sizeof(PPB_Flash_12_3));
   }
   initialized_combined_interface = true;
 }
 
 }  // namespace
 
 namespace flash {
 
 // static
 bool Flash::IsAvailable() {
-  return has_interface<PPB_Flash_12_5>() ||
+  return has_interface<PPB_Flash_12_6>() ||
+         has_interface<PPB_Flash_12_5>() ||
          has_interface<PPB_Flash_12_4>() ||
          has_interface<PPB_Flash_12_3>();
 }
 
 // static
 void Flash::SetInstanceAlwaysOnTop(const InstanceHandle& instance,
                                    bool on_top) {
   InitializeCombinedInterface();
   if (flash_12_combined_interface.SetInstanceAlwaysOnTop) {
     flash_12_combined_interface.SetInstanceAlwaysOnTop(
@@ skipping 153 matching lines @@
   InitializeCombinedInterface();
   if (flash_12_combined_interface.SetCrashData) {
     return PP_ToBool(
         flash_12_combined_interface.SetCrashData(instance.pp_instance(),
                                                  key, value.pp_var()));
   }
   return false;
 }
 
 // static
+int32_t Flash::EnumerateVideoDevicesSync(
+    const InstanceHandle& instance,
+    const VideoCapture_Dev& video_capture,
+    std::vector<DeviceRef_Dev>* devices_out) {
+  InitializeCombinedInterface();
+  if (flash_12_combined_interface.EnumerateVideoDevicesSync) {
+    ResourceArrayOutputAdapter<DeviceRef_Dev> adapter(devices_out);
+    return flash_12_combined_interface.EnumerateVideoDevicesSync(

[yzshen1, 2012/10/10 18:17:39]

Please update the function name.

[raymes, 2012/10/11 18:39:26]

Done.

+        instance.pp_instance(),
+        video_capture.pp_resource(),
+        adapter.pp_array_output());
+  }
+  return PP_ERROR_FAILED;
+}
+
+// static
 bool Flash::InvokePrinting(const InstanceHandle& instance) {
   if (has_interface<PPB_Flash_Print_1_0>()) {
     get_interface<PPB_Flash_Print_1_0>()->InvokePrinting(
         instance.pp_instance());
     return true;
   }
   return false;
 }
 
 }  // namespace flash
 }  // namespace pp