Mac Video Capture: Connect error logging to WebRTC Log

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 360 matching lines @@
   int height = params.requested_format.frame_size.height();
   int frame_rate = params.requested_format.frame_rate;
 
   // QTKit API can scale captured frame to any size requested, which would lead
   // to undesired aspect ratio changes. Try to open the camera with a known
   // supported format and let the client crop/pad the captured frames.
   if (!AVFoundationGlue::IsAVFoundationSupported())
     GetBestMatchSupportedResolution(&width, &height);
 
   client_ = client.Pass();
+  if (device_name_.capture_api_type() == Name::AVFOUNDATION)
+    SendSystemLog("Using AVFoundation for device: " + device_name_.name());

[Henrik Grunell, 2014/05/30 11:48:32]

Just to confirm: device_name_.name() is a user friendly name right? No unique
ID?

[mcasas, 2014/05/30 12:15:27]

Yes, is the camera user friendly name, with the vendor id and product id
suffixed:

"FaceTime HD Camera (Built-in) (058c:8510)"

+  else
+    SendSystemLog("Using QTKit for device: " + device_name_.name());
   NSString* deviceId =
       [NSString stringWithUTF8String:device_name_.id().c_str()];
 
   [capture_device_ setFrameReceiver:this];
 
   if (![capture_device_ setCaptureDevice:deviceId]) {
     SetErrorState("Could not open capture device.");
     return;
   }
   if (frame_rate < kMinFrameRate)
@@ skipping 162 matching lines @@
                                     reason));
 }
 
 void VideoCaptureDeviceMac::SetErrorState(const std::string& reason) {
   DCHECK(task_runner_->BelongsToCurrentThread());
   DLOG(ERROR) << reason;
   state_ = kError;
   client_->OnError(reason);
 }
 
+void VideoCaptureDeviceMac::SendSystemLog(const std::string& message) {

[Henrik Grunell, 2014/05/30 11:48:32]

Unclear to me why it's called SendSystemLog. Can you explain or rename.

[mcasas, 2014/05/30 12:15:27]

Renamed to a more simpler name.

+  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;
 }
 
 } // namespace media