mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-14 14:20:45 +01:00
1dfc4d5065
Previously we were setting the property again in it's setter. This is obviously not a great idea. CL 109641 changed ivar accesses in blocks to property accesses and this bug got introduced there. Bug: webrtc:10110, webrtc:10127, webrtc:9971 Change-Id: I01abb0885b3bfc91fb741d82d1ece015ee9d3b58 Reviewed-on: https://webrtc-review.googlesource.com/c/116062 Reviewed-by: Peter Hanspers <peterhanspers@webrtc.org> Commit-Queue: Kári Helgason <kthelgason@webrtc.org> Cr-Commit-Position: refs/heads/master@{#26124}
123 lines
4.2 KiB
Objective-C
123 lines
4.2 KiB
Objective-C
/*
|
|
* Copyright 2015 The WebRTC Project Authors. All rights reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#import "RTCCameraPreviewView.h"
|
|
|
|
#import <AVFoundation/AVFoundation.h>
|
|
#import <UIKit/UIKit.h>
|
|
|
|
#import "RTCDispatcher+Private.h"
|
|
|
|
@implementation RTCCameraPreviewView
|
|
|
|
@synthesize captureSession = _captureSession;
|
|
|
|
+ (Class)layerClass {
|
|
return [AVCaptureVideoPreviewLayer class];
|
|
}
|
|
|
|
- (instancetype)initWithFrame:(CGRect)aRect {
|
|
self = [super initWithFrame:aRect];
|
|
if (self) {
|
|
[self addOrientationObserver];
|
|
}
|
|
return self;
|
|
}
|
|
|
|
- (instancetype)initWithCoder:(NSCoder*)aDecoder {
|
|
self = [super initWithCoder:aDecoder];
|
|
if (self) {
|
|
[self addOrientationObserver];
|
|
}
|
|
return self;
|
|
}
|
|
|
|
- (void)dealloc {
|
|
[self removeOrientationObserver];
|
|
}
|
|
|
|
- (void)setCaptureSession:(AVCaptureSession *)captureSession {
|
|
if (_captureSession == captureSession) {
|
|
return;
|
|
}
|
|
_captureSession = captureSession;
|
|
[RTCDispatcher
|
|
dispatchAsyncOnType:RTCDispatcherTypeMain
|
|
block:^{
|
|
AVCaptureVideoPreviewLayer *previewLayer = [self previewLayer];
|
|
[RTCDispatcher
|
|
dispatchAsyncOnType:RTCDispatcherTypeCaptureSession
|
|
block:^{
|
|
previewLayer.session = captureSession;
|
|
[RTCDispatcher
|
|
dispatchAsyncOnType:RTCDispatcherTypeMain
|
|
block:^{
|
|
[self setCorrectVideoOrientation];
|
|
}];
|
|
}];
|
|
}];
|
|
}
|
|
|
|
- (void)layoutSubviews {
|
|
[super layoutSubviews];
|
|
|
|
// Update the video orientation based on the device orientation.
|
|
[self setCorrectVideoOrientation];
|
|
}
|
|
|
|
-(void)orientationChanged:(NSNotification *)notification {
|
|
[self setCorrectVideoOrientation];
|
|
}
|
|
|
|
- (void)setCorrectVideoOrientation {
|
|
// Get current device orientation.
|
|
UIDeviceOrientation deviceOrientation = [UIDevice currentDevice].orientation;
|
|
AVCaptureVideoPreviewLayer *previewLayer = [self previewLayer];
|
|
|
|
// First check if we are allowed to set the video orientation.
|
|
if (previewLayer.connection.isVideoOrientationSupported) {
|
|
// Set the video orientation based on device orientation.
|
|
if (deviceOrientation == UIInterfaceOrientationPortraitUpsideDown) {
|
|
previewLayer.connection.videoOrientation =
|
|
AVCaptureVideoOrientationPortraitUpsideDown;
|
|
} else if (deviceOrientation == UIInterfaceOrientationLandscapeRight) {
|
|
previewLayer.connection.videoOrientation =
|
|
AVCaptureVideoOrientationLandscapeRight;
|
|
} else if (deviceOrientation == UIInterfaceOrientationLandscapeLeft) {
|
|
previewLayer.connection.videoOrientation =
|
|
AVCaptureVideoOrientationLandscapeLeft;
|
|
} else if (deviceOrientation == UIInterfaceOrientationPortrait) {
|
|
previewLayer.connection.videoOrientation =
|
|
AVCaptureVideoOrientationPortrait;
|
|
}
|
|
// If device orientation switches to FaceUp or FaceDown, don't change video orientation.
|
|
}
|
|
}
|
|
|
|
#pragma mark - Private
|
|
|
|
- (void)addOrientationObserver {
|
|
[[NSNotificationCenter defaultCenter] addObserver:self
|
|
selector:@selector(orientationChanged:)
|
|
name:UIDeviceOrientationDidChangeNotification
|
|
object:nil];
|
|
}
|
|
|
|
- (void)removeOrientationObserver {
|
|
[[NSNotificationCenter defaultCenter] removeObserver:self
|
|
name:UIDeviceOrientationDidChangeNotification
|
|
object:nil];
|
|
}
|
|
|
|
- (AVCaptureVideoPreviewLayer *)previewLayer {
|
|
return (AVCaptureVideoPreviewLayer *)self.layer;
|
|
}
|
|
|
|
@end
|