Mac QTKit Video Capture: Force BlackMagic cameras to be opened in HD

media/video/capture/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/video/capture/mac/video_capture_device_mac.h"
 
 #include <IOKit/IOCFPlugIn.h>
 #include <IOKit/usb/IOUSBLib.h>
 #include <IOKit/usb/USBSpec.h>
 
@@ skipping 25 matching lines @@
 }
 
 - (int32_t)transportType {
   return transportType_;
 }
 
 @end  // @implementation DeviceNameAndTransportType
 
 namespace media {
 
-const int kMinFrameRate = 1;
-const int kMaxFrameRate = 30;
+const float kMinFrameRate = 1.0f;

[tommi (sloooow) - chröme, 2014/08/13 12:42:29]

can you add documentation for these constants?  I'm assuming they only apply in
specific situations (since 60.0f is being used elsewhere)

[mcasas, 2014/08/13 14:04:52]

Done.

+const float kMaxFrameRate = 30.0f;
 
 // In device identifiers, the USB VID and PID are stored in 4 bytes each.
 const size_t kVidPidSize = 4;
 
 const struct Resolution {
   const int width;
   const int height;
 } kQVGA = { 320, 240 },
   kVGA = { 640, 480 },
   kHD = { 1280, 720 };
@@ skipping 285 matching lines @@
   return id_vendor + ":" + id_product;
 }
 
 VideoCaptureDeviceMac::VideoCaptureDeviceMac(const Name& device_name)
     : device_name_(device_name),
       tried_to_square_pixels_(false),
       task_runner_(base::MessageLoopProxy::current()),
       state_(kNotInitialized),
       capture_device_(nil),
       weak_factory_(this) {
-  final_resolution_selected_ = AVFoundationGlue::IsAVFoundationSupported();
+  // Avoid reconfiguring AVFoundation or blacklisted devices.
+  final_resolution_selected_ = AVFoundationGlue::IsAVFoundationSupported() ||
+      device_name.is_blacklisted();
 }
 
 VideoCaptureDeviceMac::~VideoCaptureDeviceMac() {
   DCHECK(task_runner_->BelongsToCurrentThread());
   [capture_device_ release];
 }
 
 void VideoCaptureDeviceMac::AllocateAndStart(
     const VideoCaptureParams& params,
     scoped_ptr<VideoCaptureDevice::Client> client) {
@@ skipping 198 matching lines @@
   client_->OnError(reason);
 }
 
 void VideoCaptureDeviceMac::LogMessage(const std::string& message) {
   DCHECK(task_runner_->BelongsToCurrentThread());
   if (client_)
     client_->OnLog(message);
 }
 
 bool VideoCaptureDeviceMac::UpdateCaptureResolution() {
- 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;
+  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