Mac Video Capture: Connect error logging to WebRTC Log.

Connect the scattered DLOG(ERROR) to also send an error message to
WebRTC Log. Also log the type of API in use: QTKit or AVFoundation.

BUG=b/14652504

Review URL: https://codereview.chromium.org/308813002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@273863 0039d316-1c4b-4281-b951-d872f2087c98

content/browser/renderer_host/media/video_capture_controller.cc

@@ -131,6 +131,7 @@ class VideoCaptureController::VideoCaptureDeviceClient
       const scoped_refptr<media::VideoFrame>& frame,
       base::TimeTicks timestamp) OVERRIDE;
   virtual void OnError(const std::string& reason) OVERRIDE;
+  virtual void OnLog(const std::string& message) OVERRIDE;
 
  private:
   scoped_refptr<Buffer> DoReserveOutputBuffer(media::VideoFrame::Format format,
@@ -487,6 +488,11 @@ void VideoCaptureController::VideoCaptureDeviceClient::OnError(
       base::Bind(&VideoCaptureController::DoErrorOnIOThread, controller_));
 }
 
+void VideoCaptureController::VideoCaptureDeviceClient::OnLog(
+    const std::string& message) {
+  MediaStreamManager::SendMessageToNativeLog("Video capture: " + message);
+}
+
 scoped_refptr<media::VideoCaptureDevice::Client::Buffer>
 VideoCaptureController::VideoCaptureDeviceClient::DoReserveOutputBuffer(
     media::VideoFrame::Format format,

media/video/capture/mac/video_capture_device_avfoundation_mac.mm

@@ -49,8 +49,8 @@
   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])) {
@@ -129,7 +129,8 @@
   // 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;
   }
 
@@ -140,8 +141,10 @@
                       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_];
@@ -152,7 +155,8 @@
       [[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_
@@ -270,14 +274,17 @@
 - (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],
+                       [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

media/video/capture/mac/video_capture_device_mac.h

@@ -52,6 +52,7 @@ class VideoCaptureDeviceMac : public VideoCaptureDevice {
 
  private:
   void SetErrorState(const std::string& reason);
+  void LogMessage(const std::string& message);
   bool UpdateCaptureResolution();
 
   // Flag indicating the internal state.

media/video/capture/mac/video_capture_device_mac.mm

@@ -378,6 +378,10 @@ void VideoCaptureDeviceMac::AllocateAndStart(
     GetBestMatchSupportedResolution(&width, &height);
 
   client_ = client.Pass();
+  if (device_name_.capture_api_type() == Name::AVFOUNDATION)
+    LogMessage("Using AVFoundation for device: " + device_name_.name());
+  else
+    LogMessage("Using QTKit for device: " + device_name_.name());
   NSString* deviceId =
       [NSString stringWithUTF8String:device_name_.id().c_str()];
 
@@ -560,6 +564,12 @@ void VideoCaptureDeviceMac::SetErrorState(const std::string& reason) {
   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()

media/video/capture/mac/video_capture_device_qtkit_mac.mm

@@ -78,25 +78,31 @@
       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 (%@): %@",
+                           [error localizedDescription],
+                           [error localizedFailureReason]]];
       return NO;
     }
     captureDeviceInput_ = [[QTCaptureDeviceInput alloc] initWithDevice:device];
@@ -106,8 +112,10 @@
         [[[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;
     }
 
@@ -126,7 +134,8 @@
   } 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) {
@@ -139,15 +148,14 @@
       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];
@@ -162,15 +170,17 @@
 
 - (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;
   }
 
@@ -196,14 +206,18 @@
 - (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 =
@@ -309,12 +323,18 @@
 - (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],
+                       [error localizedFailureReason]]];
+}
 
-  frameReceiver_->ReceiveError([str_error UTF8String]);
+- (void)sendErrorString:(NSString*)error {
+  DLOG(ERROR) << [error UTF8String];
+  [lock_ lock];
+  if (frameReceiver_)
+    frameReceiver_->ReceiveError([error UTF8String]);
+  [lock_ unlock];
 }
 
 @end

media/video/capture/video_capture_device.h

@@ -187,6 +187,9 @@ class MEDIA_EXPORT VideoCaptureDevice {
     // An error has occurred that cannot be handled and VideoCaptureDevice must
     // be StopAndDeAllocate()-ed. |reason| is a text description of the error.
     virtual void OnError(const std::string& reason) = 0;
+
+    // VideoCaptureDevice requests the |message| to be logged.
+    virtual void OnLog(const std::string& message) {}
   };
 
   // Creates a VideoCaptureDevice object.