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 |
11 #import "WebRTC/RTCCameraPreviewView.h" | 11 #import "WebRTC/RTCCameraPreviewView.h" |
12 | 12 |
13 #import <AVFoundation/AVFoundation.h> | 13 #import <AVFoundation/AVFoundation.h> |
14 #import <UIKit/UIKit.h> | 14 #import <UIKit/UIKit.h> |
15 | 15 |
16 #import "RTCDispatcher+Private.h" | 16 #import "RTCDispatcher+Private.h" |
17 | 17 |
18 @implementation RTCCameraPreviewView | 18 @implementation RTCCameraPreviewView |
19 | 19 |
20 @synthesize captureSession = _captureSession; | 20 @synthesize captureSession = _captureSession; |
| 21 @synthesize shouldUpdateVideoOrientationOnDeviceRotation = |
| 22 _shouldUpdateVideoOrientationOnDeviceRotation; |
21 | 23 |
22 + (Class)layerClass { | 24 + (Class)layerClass { |
23 return [AVCaptureVideoPreviewLayer class]; | 25 return [AVCaptureVideoPreviewLayer class]; |
24 } | 26 } |
25 | 27 |
| 28 - (instancetype)init { |
| 29 if (self = [super init]) { |
| 30 _shouldUpdateVideoOrientationOnDeviceRotation = YES; |
| 31 } |
| 32 return self; |
| 33 } |
| 34 |
26 - (void)setCaptureSession:(AVCaptureSession *)captureSession { | 35 - (void)setCaptureSession:(AVCaptureSession *)captureSession { |
27 if (_captureSession == captureSession) { | 36 if (_captureSession == captureSession) { |
28 return; | 37 return; |
29 } | 38 } |
30 _captureSession = captureSession; | 39 _captureSession = captureSession; |
31 AVCaptureVideoPreviewLayer *previewLayer = [self previewLayer]; | 40 AVCaptureVideoPreviewLayer *previewLayer = [self previewLayer]; |
32 [RTCDispatcher dispatchAsyncOnType:RTCDispatcherTypeCaptureSession | 41 [RTCDispatcher dispatchAsyncOnType:RTCDispatcherTypeCaptureSession |
33 block:^{ | 42 block:^{ |
34 previewLayer.session = captureSession; | 43 previewLayer.session = captureSession; |
35 }]; | 44 }]; |
36 } | 45 } |
37 | 46 |
38 - (void)layoutSubviews { | 47 - (void)layoutSubviews { |
39 [super layoutSubviews]; | 48 [super layoutSubviews]; |
40 | 49 |
41 // Update the video orientation based on the device orientation. | 50 // Update the video orientation based on the device orientation. |
42 [self setCorrectVideoOrientation]; | 51 if (_shouldUpdateVideoOrientationOnDeviceRotation) { |
| 52 [self setCorrectVideoOrientation]; |
| 53 } |
43 } | 54 } |
44 | 55 |
45 - (void)setCorrectVideoOrientation { | 56 - (void)setCorrectVideoOrientation { |
46 // Get current device orientation. | 57 // Get current device orientation. |
47 UIDeviceOrientation deviceOrientation = [UIDevice currentDevice].orientation; | 58 UIDeviceOrientation deviceOrientation = [UIDevice currentDevice].orientation; |
48 AVCaptureVideoPreviewLayer *previewLayer = [self previewLayer]; | 59 AVCaptureVideoPreviewLayer *previewLayer = [self previewLayer]; |
49 | 60 |
50 // First check if we are allowed to set the video orientation. | 61 // First check if we are allowed to set the video orientation. |
51 if (previewLayer.connection.isVideoOrientationSupported) { | 62 if (previewLayer.connection.isVideoOrientationSupported) { |
52 // Set the video orientation based on device orientation. | 63 // Set the video orientation based on device orientation. |
(...skipping 13 matching lines...) Expand all Loading... |
66 } | 77 } |
67 } | 78 } |
68 | 79 |
69 #pragma mark - Private | 80 #pragma mark - Private |
70 | 81 |
71 - (AVCaptureVideoPreviewLayer *)previewLayer { | 82 - (AVCaptureVideoPreviewLayer *)previewLayer { |
72 return (AVCaptureVideoPreviewLayer *)self.layer; | 83 return (AVCaptureVideoPreviewLayer *)self.layer; |
73 } | 84 } |
74 | 85 |
75 @end | 86 @end |
OLD | NEW |