| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #import "media/video/capture/mac/video_capture_device_qtkit_mac.h" | 5 #import "media/video/capture/mac/video_capture_device_qtkit_mac.h" |
| 6 | 6 |
| 7 #import <QTKit/QTKit.h> | 7 #import <QTKit/QTKit.h> |
| 8 | 8 |
| 9 #include "base/debug/crash_logging.h" | 9 #include "base/debug/crash_logging.h" |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| 11 #include "base/mac/scoped_nsexception_enabler.h" | 11 #include "base/mac/scoped_nsexception_enabler.h" |
| 12 #include "media/base/video_capture_types.h" |
| 12 #include "media/video/capture/mac/video_capture_device_mac.h" | 13 #include "media/video/capture/mac/video_capture_device_mac.h" |
| 13 #include "media/video/capture/video_capture_device.h" | 14 #include "media/video/capture/video_capture_device.h" |
| 14 #include "media/video/capture/video_capture_types.h" | |
| 15 #include "ui/gfx/geometry/size.h" | 15 #include "ui/gfx/geometry/size.h" |
| 16 | 16 |
| 17 @implementation VideoCaptureDeviceQTKit | 17 @implementation VideoCaptureDeviceQTKit |
| 18 | 18 |
| 19 #pragma mark Class methods | 19 #pragma mark Class methods |
| 20 | 20 |
| 21 + (void)getDeviceNames:(NSMutableDictionary*)deviceNames { | 21 + (void)getDeviceNames:(NSMutableDictionary*)deviceNames { |
| 22 // Third-party drivers often throw exceptions, which are fatal in | 22 // Third-party drivers often throw exceptions, which are fatal in |
| 23 // Chromium (see comments in scoped_nsexception_enabler.h). The | 23 // Chromium (see comments in scoped_nsexception_enabler.h). The |
| 24 // following catches any exceptions and continues in an orderly | 24 // following catches any exceptions and continues in an orderly |
| (...skipping 323 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 348 | 348 |
| 349 - (void)sendLogString:(NSString*)message { | 349 - (void)sendLogString:(NSString*)message { |
| 350 DVLOG(1) << [message UTF8String]; | 350 DVLOG(1) << [message UTF8String]; |
| 351 [lock_ lock]; | 351 [lock_ lock]; |
| 352 if (frameReceiver_) | 352 if (frameReceiver_) |
| 353 frameReceiver_->LogMessage([message UTF8String]); | 353 frameReceiver_->LogMessage([message UTF8String]); |
| 354 [lock_ unlock]; | 354 [lock_ unlock]; |
| 355 } | 355 } |
| 356 | 356 |
| 357 @end | 357 @end |
| OLD | NEW |