diff options
author | jiayl@chromium.org <jiayl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-03 11:35:06 +0000 |
---|---|---|
committer | jiayl@chromium.org <jiayl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-03 11:35:06 +0000 |
commit | 8c19a55827ddcb029e168324ea2336ddd2c8fc04 (patch) | |
tree | 7267e33b557db90359fcd8413521da410a787553 | |
parent | 65931348282198089ee550c681c5b3b7fdcea704 (diff) | |
download | chromium_src-8c19a55827ddcb029e168324ea2336ddd2c8fc04.zip chromium_src-8c19a55827ddcb029e168324ea2336ddd2c8fc04.tar.gz chromium_src-8c19a55827ddcb029e168324ea2336ddd2c8fc04.tar.bz2 |
Adds the failure reason to the VideoCaptureDevice error message on Mac.
This will help debug camera issues for getUserMedia callers.
BUG=
Review URL: https://codereview.chromium.org/221413006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@261342 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | media/video/capture/mac/video_capture_device_avfoundation_mac.mm | 7 | ||||
-rw-r--r-- | media/video/capture/mac/video_capture_device_qtkit_mac.mm | 7 |
2 files changed, 12 insertions, 2 deletions
diff --git a/media/video/capture/mac/video_capture_device_avfoundation_mac.mm b/media/video/capture/mac/video_capture_device_avfoundation_mac.mm index dee6bc0..8e4d07b 100644 --- a/media/video/capture/mac/video_capture_device_avfoundation_mac.mm +++ b/media/video/capture/mac/video_capture_device_avfoundation_mac.mm @@ -297,9 +297,14 @@ - (void)onVideoError:(NSNotification*)errorNotification { NSError* error = base::mac::ObjCCast<NSError>([[errorNotification userInfo] objectForKey:AVFoundationGlue::AVCaptureSessionErrorKey()]); + NSString* str_error = + [NSString stringWithFormat:@"%@: %@", + [error localizedDescription], + [error localizedFailureReason]]; + base::AutoLock lock(lock_); if (frameReceiver_) - frameReceiver_->ReceiveError([[error localizedDescription] UTF8String]); + frameReceiver_->ReceiveError([str_error UTF8String]); } @end diff --git a/media/video/capture/mac/video_capture_device_qtkit_mac.mm b/media/video/capture/mac/video_capture_device_qtkit_mac.mm index a4bf71d..0b62867 100644 --- a/media/video/capture/mac/video_capture_device_qtkit_mac.mm +++ b/media/video/capture/mac/video_capture_device_qtkit_mac.mm @@ -309,7 +309,12 @@ - (void)handleNotification:(NSNotification*)errorNotification { NSError * error = (NSError*)[[errorNotification userInfo] objectForKey:QTCaptureSessionErrorKey]; - frameReceiver_->ReceiveError([[error localizedDescription] UTF8String]); + NSString* str_error = + [NSString stringWithFormat:@"%@: %@", + [error localizedDescription], + [error localizedFailureReason]]; + + frameReceiver_->ReceiveError([str_error UTF8String]); } @end |