| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2015 The WebRTC project authors. All Rights Reserved. | 2 * Copyright 2015 The WebRTC project authors. All Rights Reserved. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
| 5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
| 6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
| 7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
| 8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
| 9 */ | 9 */ |
| 10 | 10 |
| (...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 279 } | 279 } |
| 280 | 280 |
| 281 - (void)handleCaptureSessionInterruptionEnded:(NSNotification *)notification { | 281 - (void)handleCaptureSessionInterruptionEnded:(NSNotification *)notification { |
| 282 RTCLog(@"Capture session interruption ended."); | 282 RTCLog(@"Capture session interruption ended."); |
| 283 // TODO(tkchin): Handle this case. | 283 // TODO(tkchin): Handle this case. |
| 284 } | 284 } |
| 285 | 285 |
| 286 - (void)handleCaptureSessionRuntimeError:(NSNotification *)notification { | 286 - (void)handleCaptureSessionRuntimeError:(NSNotification *)notification { |
| 287 NSError *error = | 287 NSError *error = |
| 288 [notification.userInfo objectForKey:AVCaptureSessionErrorKey]; | 288 [notification.userInfo objectForKey:AVCaptureSessionErrorKey]; |
| 289 RTCLogError(@"Capture session runtime error: %@", error.localizedDescription); | 289 RTCLogError(@"Capture session runtime error: %@", error); |
| 290 | 290 |
| 291 [RTCDispatcher dispatchAsyncOnType:RTCDispatcherTypeCaptureSession | 291 [RTCDispatcher dispatchAsyncOnType:RTCDispatcherTypeCaptureSession |
| 292 block:^{ | 292 block:^{ |
| 293 #if TARGET_OS_IPHONE | 293 #if TARGET_OS_IPHONE |
| 294 if (error.code == AVErrorMediaServicesWereReset) { | 294 if (error.code == AVErrorMediaServicesWereReset) { |
| 295 [self handleNonFatalError]; | 295 [self handleNonFatalError]; |
| 296 } else { | 296 } else { |
| 297 [self handleFatalError]; | 297 [self handleFatalError]; |
| 298 } | 298 } |
| 299 #else | 299 #else |
| (...skipping 380 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 680 } | 680 } |
| 681 | 681 |
| 682 OnFrame(cricket::WebRtcVideoFrame(buffer, webrtc::kVideoRotation_0, | 682 OnFrame(cricket::WebRtcVideoFrame(buffer, webrtc::kVideoRotation_0, |
| 683 translated_camera_time_us), | 683 translated_camera_time_us), |
| 684 captured_width, captured_height); | 684 captured_width, captured_height); |
| 685 | 685 |
| 686 CVBufferRelease(image_buffer); | 686 CVBufferRelease(image_buffer); |
| 687 } | 687 } |
| 688 | 688 |
| 689 } // namespace webrtc | 689 } // namespace webrtc |
| OLD | NEW |