| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/capture/video/mac/video_capture_device_avfoundation_mac.h" | 5 #import "media/capture/video/mac/video_capture_device_avfoundation_mac.h" |
| 6 | 6 |
| 7 #import <CoreMedia/CoreMedia.h> | 7 #import <CoreMedia/CoreMedia.h> |
| 8 #import <CoreVideo/CoreVideo.h> | 8 #import <CoreVideo/CoreVideo.h> |
| 9 #include <stddef.h> |
| 10 #include <stdint.h> |
| 9 | 11 |
| 10 #include "base/location.h" | 12 #include "base/location.h" |
| 11 #include "base/logging.h" | 13 #include "base/logging.h" |
| 12 #include "base/mac/foundation_util.h" | 14 #include "base/mac/foundation_util.h" |
| 13 #include "media/base/timestamp_constants.h" | 15 #include "media/base/timestamp_constants.h" |
| 14 #include "media/base/video_capture_types.h" | 16 #include "media/base/video_capture_types.h" |
| 15 #include "media/capture/video/mac/video_capture_device_mac.h" | 17 #include "media/capture/video/mac/video_capture_device_mac.h" |
| 16 #include "ui/gfx/geometry/size.h" | 18 #include "ui/gfx/geometry/size.h" |
| 17 | 19 |
| 18 // Prefer MJPEG if frame width or height is larger than this. | 20 // Prefer MJPEG if frame width or height is larger than this. |
| (...skipping 341 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 360 } | 362 } |
| 361 | 363 |
| 362 - (void)sendErrorString:(NSString*)error { | 364 - (void)sendErrorString:(NSString*)error { |
| 363 DLOG(ERROR) << [error UTF8String]; | 365 DLOG(ERROR) << [error UTF8String]; |
| 364 base::AutoLock lock(lock_); | 366 base::AutoLock lock(lock_); |
| 365 if (frameReceiver_) | 367 if (frameReceiver_) |
| 366 frameReceiver_->ReceiveError(FROM_HERE, [error UTF8String]); | 368 frameReceiver_->ReceiveError(FROM_HERE, [error UTF8String]); |
| 367 } | 369 } |
| 368 | 370 |
| 369 @end | 371 @end |
| OLD | NEW |