Mac Video Capture: Connect error logging to WebRTC Log

media/video/capture/mac/video_capture_device_qtkit_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.
 
 #import "media/video/capture/mac/video_capture_device_qtkit_mac.h"
 
 #import <QTKit/QTKit.h>
 
 #include "base/debug/crash_logging.h"
 #include "base/logging.h"
@@ skipping 60 matching lines @@
 }
 
 - (BOOL)setCaptureDevice:(NSString*)deviceId {
   if (deviceId) {
     // Set the capture device.
     if (captureDeviceInput_) {
       DLOG(ERROR) << "Video capture device already set.";
       return NO;
     }
 
+    // TODO(mcasas): Consider using [QTCaptureDevice deviceWithUniqueID] instead
+    // of explicitly forcing reenumeration of devices.
     NSArray *captureDevices =
         [QTCaptureDevice inputDevicesWithMediaType:QTMediaTypeVideo];
     NSArray *captureDevicesNames =
         [captureDevices valueForKey:@"uniqueID"];
     NSUInteger index = [captureDevicesNames indexOfObject:deviceId];
     if (index == NSNotFound) {
-      DLOG(ERROR) << "Video capture device not found.";
+      [self sendErrorString:[NSString
+        stringWithUTF8String:"Video capture device not found."]];
       return NO;
     }
     QTCaptureDevice *device = [captureDevices objectAtIndex:index];
     if ([[device attributeForKey:QTCaptureDeviceSuspendedAttribute]
             boolValue]) {
-      DLOG(ERROR) << "Cannot open suspended video capture device.";
+      [self sendErrorString:[NSString
+        stringWithUTF8String:"Cannot open suspended video capture device."]];
       return NO;
     }
     NSError *error;
     if (![device open:&error]) {
-      DLOG(ERROR) << "Could not open video capture device."
-                  << [[error localizedDescription] UTF8String];
+      [self sendErrorString:[NSString
+          stringWithFormat:@"Could not open video capture device: %@ %@",

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

Clarify by for example "...: %@, reason: %@". Here and everywhere in the CL.

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

Used the original "Big error (%@): %@", this should output stuff like:

"Big error (Operation could not be completed): Device is inexistent"

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

SGTM

+                           [error localizedDescription],
+                           [error localizedFailureReason]]];
       return NO;
     }
     captureDeviceInput_ = [[QTCaptureDeviceInput alloc] initWithDevice:device];
     captureSession_ = [[QTCaptureSession alloc] init];
 
     QTCaptureDecompressedVideoOutput *captureDecompressedOutput =
         [[[QTCaptureDecompressedVideoOutput alloc] init] autorelease];
     [captureDecompressedOutput setDelegate:self];
     if (![captureSession_ addOutput:captureDecompressedOutput error:&error]) {
-      DLOG(ERROR) << "Could not connect video capture output."
-                  << [[error localizedDescription] UTF8String];
+      [self sendErrorString:[NSString
+          stringWithFormat:@"Could not connect video capture output: %@ %@",
+                           [error localizedDescription],
+                           [error localizedFailureReason]]];
       return NO;
     }
 
     // This key can be used to check if video capture code was related to a
     // particular crash.
     base::debug::SetCrashKeyValue("VideoCaptureDeviceQTKit", "OpenedDevice");
 
     // Set the video pixel format to 2VUY (a.k.a UYVY, packed 4:2:2).
     NSDictionary *captureDictionary = [NSDictionary
         dictionaryWithObject:
             [NSNumber numberWithUnsignedInt:kCVPixelFormatType_422YpCbCr8]
                       forKey:(id)kCVPixelBufferPixelFormatTypeKey];
     [captureDecompressedOutput setPixelBufferAttributes:captureDictionary];
 
     return YES;
   } else {
     // Remove the previously set capture device.
     if (!captureDeviceInput_) {
-      DLOG(ERROR) << "No video capture device set.";
+      [self sendErrorString:[NSString
+          stringWithUTF8String:"No video capture device set, on removal."]];
       return YES;
     }
     if ([[captureSession_ inputs] count] > 0) {
       // The device is still running.
       [self stopCapture];
     }
     if ([[captureSession_ outputs] count] > 0) {
       // Only one output is set for |captureSession_|.
       DCHECK_EQ([[captureSession_ outputs] count], 1u);
       id output = [[captureSession_ outputs] objectAtIndex:0];
       [output setDelegate:nil];
 
-      // TODO(shess): QTKit achieves thread safety by posting messages
-      // to the main thread.  As part of -addOutput:, it posts a
-      // message to the main thread which in turn posts a notification
-      // which will run in a future spin after the original method
-      // returns.  -removeOutput: can post a main-thread message in
-      // between while holding a lock which the notification handler
-      // will need.  Posting either -addOutput: or -removeOutput: to
-      // the main thread should fix it, remove is likely safer.
-      // http://crbug.com/152757
+      // TODO(shess): QTKit achieves thread safety by posting messages to the
+      // main thread.  As part of -addOutput:, it posts a message to the main
+      // thread which in turn posts a notification which will run in a future
+      // spin after the original method returns.  -removeOutput: can post a
+      // main-thread message in between while holding a lock which the
+      // notification handler  will need.  Posting either -addOutput: or
+      // -removeOutput: to the main thread should fix it, remove is likely
+      // safer. http://crbug.com/152757
       [captureSession_ performSelectorOnMainThread:@selector(removeOutput:)
                                         withObject:output
                                      waitUntilDone:YES];
     }
     [captureSession_ release];
     captureSession_ = nil;
     [captureDeviceInput_ release];
     captureDeviceInput_ = nil;
     return YES;
   }
 }
 
 - (BOOL)setCaptureHeight:(int)height width:(int)width frameRate:(int)frameRate {
   if (!captureDeviceInput_) {
-    DLOG(ERROR) << "No video capture device set.";
+    [self sendErrorString:[NSString
+        stringWithUTF8String:"No video capture device set."]];
     return NO;
   }
   if ([[captureSession_ outputs] count] != 1) {
-    DLOG(ERROR) << "Video capture capabilities already set.";
+    [self sendErrorString:[NSString
+        stringWithUTF8String:"Video capture capabilities already set."]];
     return NO;
   }
   if (frameRate <= 0) {
-    DLOG(ERROR) << "Wrong frame rate.";
+    [self sendErrorString:[NSString stringWithUTF8String: "Wrong frame rate."]];
     return NO;
   }
 
   frameRate_ = frameRate;
 
   QTCaptureDecompressedVideoOutput *output =
       [[captureSession_ outputs] objectAtIndex:0];
 
   // Set up desired output properties. The old capture dictionary is used to
   // retrieve the initial pixel format, which must be maintained.
   NSDictionary* videoSettingsDictionary = @{
     (id)kCVPixelBufferWidthKey : @(width),
     (id)kCVPixelBufferHeightKey : @(height),
     (id)kCVPixelBufferPixelFormatTypeKey : [[output pixelBufferAttributes]
         valueForKey:(id)kCVPixelBufferPixelFormatTypeKey]
   };
   [output setPixelBufferAttributes:videoSettingsDictionary];
 
   [output setMinimumVideoFrameInterval:(NSTimeInterval)1/(float)frameRate];
   return YES;
 }
 
 - (BOOL)startCapture {
   if ([[captureSession_ outputs] count] == 0) {
     // Capture properties not set.
-    DLOG(ERROR) << "Video capture device not initialized.";
+    [self sendErrorString:[NSString
+        stringWithUTF8String:"Video capture device not initialized."]];
     return NO;
   }
   if ([[captureSession_ inputs] count] == 0) {
     NSError *error;
     if (![captureSession_ addInput:captureDeviceInput_ error:&error]) {
-      DLOG(ERROR) << "Could not connect video capture device."
-                  << [[error localizedDescription] UTF8String];
+      [self sendErrorString:[NSString
+          stringWithFormat:@"Could not connect video capture device: %@ %@",
+                           [error localizedDescription],
+                           [error localizedFailureReason]]];
+
       return NO;
     }
     NSNotificationCenter * notificationCenter =
         [NSNotificationCenter defaultCenter];
     [notificationCenter addObserver:self
                            selector:@selector(handleNotification:)
                                name:QTCaptureSessionRuntimeErrorNotification
                              object:captureSession_];
     [captureSession_ startRunning];
   }
@@ skipping 85 matching lines @@
         aspectNumerator, aspectDenominator);
 
     CVPixelBufferUnlockBaseAddress(videoFrame, kLockFlags);
   }
   [lock_ unlock];
 }
 
 - (void)handleNotification:(NSNotification*)errorNotification {
   NSError * error = (NSError*)[[errorNotification userInfo]
       objectForKey:QTCaptureSessionErrorKey];
-  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: Same here.

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