Change the functions in video_capture_device to pass around PowerLineFrequency enums instead of int…

media/capture/video/mac/video_capture_device_mac.mm

 // 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 "media/capture/video/mac/video_capture_device_mac.h"
 
 #include <IOKit/IOCFPlugIn.h>
 #include <IOKit/usb/IOUSBLib.h>
 #include <IOKit/usb/USBSpec.h>
 
@@ skipping 171 matching lines @@
     DLOG(ERROR) << "IOCreatePlugInInterfaceForService";
     return false;
   }
   return true;
 }
 
 // Creates a control interface for |plugin_interface| and produces a command to
 // set the appropriate Power Line frequency for flicker removal.
 static void SetAntiFlickerInVideoControlInterface(
     IOCFPlugInInterface** plugin_interface,
-    const int frequency) {
+    const PowerLineFrequency frequency) {
   // Create, the control interface for the found plugin, and release
   // the intermediate plugin.
   IOUSBInterfaceInterface** control_interface = NULL;
   HRESULT res =
       (*plugin_interface)
           ->QueryInterface(plugin_interface,
                            CFUUIDGetUUIDBytes(kIOUSBInterfaceInterfaceID),
                            reinterpret_cast<LPVOID*>(&control_interface));
   if (!SUCCEEDED(res) || !control_interface) {
     DLOG(ERROR) << "Couldn’t create control interface";
@@ skipping 39 matching lines @@
       USBmakebmRequestType(kUSBOut, kUSBClass, kUSBInterface);
   command.bRequest = kVcRequestCodeSetCur;
   UInt8 interface_number;
   (*control_interface)
       ->GetInterfaceNumber(control_interface, &interface_number);
   command.wIndex = (real_unit_id << 8) | interface_number;
   const int selector = kPuPowerLineFrequencyControl;
   command.wValue = (selector << 8);
   command.wLength = kPuPowerLineFrequencyControlCommandSize;
   command.wLenDone = 0;
-  int power_line_flag_value = (frequency == 50) ? k50Hz : k60Hz;
+  int power_line_flag_value =
+      (frequency == PowerLineFrequency::FREQUENCY_50HZ) ? k50Hz : k60Hz;
   command.pData = &power_line_flag_value;
 
   IOReturn ret =
       (*control_interface)->ControlRequest(control_interface, 0, &command);
   DLOG_IF(ERROR, ret != kIOReturnSuccess) << "Anti-flicker control request"
                                           << " failed (0x" << std::hex << ret
                                           << "), unit id: " << real_unit_id;
-  DVLOG_IF(1, ret == kIOReturnSuccess) << "Anti-flicker set to " << frequency
-                                       << "Hz";
+  DVLOG_IF(1, ret == kIOReturnSuccess) << "Anti-flicker set to "
+                                       << static_cast<int>(frequency) << "Hz";
 
   (*control_interface)->USBInterfaceClose(control_interface);
 }
 
 // Sets the flicker removal in a USB webcam identified by |vendor_id| and
 // |product_id|, if available. The process includes first finding all USB
 // devices matching the specified |vendor_id| and |product_id|; for each
 // matching device, a device interface, and inside it a video control interface
 // are created. The latter is used to a send a power frequency setting command.
 static void SetAntiFlickerInUsbDevice(const int vendor_id,
                                       const int product_id,
-                                      const int frequency) {
-  if (frequency == 0)
+                                      const PowerLineFrequency frequency) {
+  if (frequency
+
+      == PowerLineFrequency::FREQUENCY_DEFAULT)

[ajose, 2015/09/29 22:10:14]

1 line?

     return;
-  DVLOG(1) << "Setting Power Line Frequency to " << frequency << " Hz, device "
-           << std::hex << vendor_id << "-" << product_id;
+  DVLOG(1) << "Setting Power Line Frequency to " << static_cast<int>(frequency)
+           << " Hz, device " << std::hex << vendor_id << "-" << product_id;
 
   // Compose a search dictionary with vendor and product ID.
   CFMutableDictionaryRef query_dictionary =
       IOServiceMatching(kIOUSBDeviceClassName);
   CFDictionarySetValue(
       query_dictionary, CFSTR(kUSBVendorName),
       CFNumberCreate(kCFAllocatorDefault, kCFNumberSInt32Type, &vendor_id));
   CFDictionarySetValue(
       query_dictionary, CFSTR(kUSBProductName),
       CFNumberCreate(kCFAllocatorDefault, kCFNumberSInt32Type, &product_id));
@@ skipping 272 matching lines @@
   if (![capture_device_ setCaptureHeight:capture_format_.frame_size.height()
                                    width:capture_format_.frame_size.width()
                                frameRate:capture_format_.frame_rate]) {
     ReceiveError("Could not configure capture device.");
     return false;
   }
   return true;
 }
 
 }  // namespace media