Mac Video Capture: Connect error logging to WebRTC Log

media/video/capture/mac/video_capture_device_avfoundation_mac.mm

 // Copyright 2013 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.
 
 #import "media/video/capture/mac/video_capture_device_avfoundation_mac.h"
 
 #import <CoreVideo/CoreVideo.h>
 
 #include "base/logging.h"
 #include "base/mac/foundation_util.h"
@@ skipping 31 matching lines @@
  supportedFormats:(media::VideoCaptureFormats*)formats{
   NSArray* devices = [AVCaptureDeviceGlue devices];
   CrAVCaptureDevice* device = nil;
   for (device in devices) {
     if ([[device uniqueID] UTF8String] == name.id())
       break;
   }
   if (device == nil)
     return;
   for (CrAVCaptureDeviceFormat* format in device.formats) {
-    // MediaSubType comes is a CMPixelFormatType but can be used as
-    // CVPixelFormatType as well according to CMFormatDescription.h
+    // MediaSubType is a CMPixelFormatType but can be used as CVPixelFormatType
+    // as well according to CMFormatDescription.h
     media::VideoPixelFormat pixelFormat = media::PIXEL_FORMAT_UNKNOWN;
     switch (CoreMediaGlue::CMFormatDescriptionGetMediaSubType(
                 [format formatDescription])) {
       case kCVPixelFormatType_422YpCbCr8:  // Typical.
         pixelFormat = media::PIXEL_FORMAT_UYVY;
         break;
       case CoreMediaGlue::kCMPixelFormat_422YpCbCr8_yuvs:
         pixelFormat = media::PIXEL_FORMAT_YUY2;
         break;
       case CoreMediaGlue::kCMVideoCodecType_JPEG_OpenDML:
@@ skipping 58 matching lines @@
       [captureSession_ removeInput:captureDeviceInput_];
       // No need to release |captureDeviceInput_|, is owned by the session.
       captureDeviceInput_ = nil;
     }
     return YES;
   }
 
   // Look for input device with requested name.
   captureDevice_ = [AVCaptureDeviceGlue deviceWithUniqueID:deviceId];
   if (!captureDevice_) {
-    DLOG(ERROR) << "Could not open video capture device.";
+    [self sendErrorString:[NSString
+        stringWithUTF8String:"Could not open video capture device."]];
     return NO;
   }
 
   // Create the capture input associated with the device. Easy peasy.
   NSError* error = nil;
   captureDeviceInput_ = [AVCaptureDeviceInputGlue
       deviceInputWithDevice:captureDevice_
                       error:&error];
   if (!captureDeviceInput_) {
     captureDevice_ = nil;
-    DLOG(ERROR) << "Could not create video capture input: "
-                << [[error localizedDescription] UTF8String];
+    [self sendErrorString:[NSString
+        stringWithFormat:@"Could not create video capture input: %@ %@",
+                         [error localizedDescription],
+                         [error localizedFailureReason]]];
     return NO;
   }
   [captureSession_ addInput:captureDeviceInput_];
 
   // Create a new data output for video. The data output is configured to
   // discard late frames by default.
   captureVideoDataOutput_.reset(
       [[AVFoundationGlue::AVCaptureVideoDataOutputClass() alloc] init]);
   if (!captureVideoDataOutput_) {
     [captureSession_ removeInput:captureDeviceInput_];
-    DLOG(ERROR) << "Could not create video data output.";
+    [self sendErrorString:[NSString
+        stringWithUTF8String:"Could not create video data output."]];
     return NO;
   }
   [captureVideoDataOutput_
       setSampleBufferDelegate:self
                         queue:dispatch_get_global_queue(
                             DISPATCH_QUEUE_PRIORITY_DEFAULT, 0)];
   [captureSession_ addOutput:captureVideoDataOutput_];
   return YES;
 }
 
@@ skipping 97 matching lines @@
     if (!frameReceiver_)
       return;
     frameReceiver_->ReceiveFrame(addressToPass, frameSize, captureFormat, 0, 0);
     CVPixelBufferUnlockBaseAddress(videoFrame, kLockFlags);
   }
 }
 
 - (void)onVideoError:(NSNotification*)errorNotification {
   NSError* error = base::mac::ObjCCast<NSError>([[errorNotification userInfo]
       objectForKey:AVFoundationGlue::AVCaptureSessionErrorKey()]);
-  NSString* str_error =
-      [NSString stringWithFormat:@"%@: %@",
-                                 [error localizedDescription],
-                                 [error localizedFailureReason]];
+  [self sendErrorString:[NSString stringWithFormat:@"%@: %@",
+                                             [error localizedDescription],

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

Fix indentation.

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

Done.

[Henrik Grunell, 2014/05/30 12:30:48]

Nit: I don't know how objective-c is usually indented, but it seems above that
the [ usually is under the @. Maybe line break before stringWithFormat and
format like that? I'm fine with either.

+                                             [error localizedFailureReason]]];
+}
 
+- (void)sendErrorString:(NSString*)error {
+  DLOG(ERROR) << [error UTF8String];
   base::AutoLock lock(lock_);
   if (frameReceiver_)
-    frameReceiver_->ReceiveError([str_error UTF8String]);
+    frameReceiver_->ReceiveError([error UTF8String]);
 }
 
 @end