Reason for revert: Take three of relanding this after all internal issues have been resolved. Original issue's description: > Revert of Split iOS sdk in to separate targets (patchset #3 id:320001 of https://codereview.webrtc.org/2893843003/ ) > > Reason for revert: > Breaks downstream project. > > Original issue's description: > > Reland of Split iOS sdk in to separate targets (patchset #1 id:1 of https://codereview.webrtc.org/2893593002/ ) > > > > Reason for revert: > > Take two of fixing downstream issues? > > > > Original issue's description: > > > Revert of Split iOS sdk in to separate targets (patchset #1 id:1 of https://codereview.webrtc.org/2890733003/ ) > > > > > > Reason for revert: > > > Still problems with downstream projects > > > > > > Original issue's description: > > > > Reland of Split iOS sdk in to separate targets (patchset #1 id:1 of https://codereview.webrtc.org/2890513002/ ) > > > > > > > > Reason for revert: > > > > Fixing downstream breakages > > > > > > > > Original issue's description: > > > > > Revert of Split iOS sdk in to separate targets (patchset #13 id:280001 of https://codereview.webrtc.org/2862543002/ ) > > > > > > > > > > Reason for revert: > > > > > Breaking downstream projects. > > > > > > > > > > Original issue's description: > > > > > > Split iOS sdk in to separate targets > > > > > > > > > > > > This CL splits the iOS sdk into separate static libraries for video, > > > > > > audio, ui, common, and peerconnection-related code. This will in the > > > > > > future make it easier to compile WebRTC without unneeded components. > > > > > > > > > > > > BUG=webrtc:4867 > > > > > > > > > > > > Review-Url: https://codereview.webrtc.org/2862543002 > > > > > > Cr-Commit-Position: refs/heads/master@{#18166} > > > > > > Committed:52c83fe710> > > > > > > > > > TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,kthelgason@webrtc.org > > > > > # Skipping CQ checks because original CL landed less than 1 days ago. > > > > > NOPRESUBMIT=true > > > > > NOTREECHECKS=true > > > > > NOTRY=true > > > > > BUG=webrtc:4867 > > > > > > > > > > Review-Url: https://codereview.webrtc.org/2890513002 > > > > > Cr-Commit-Position: refs/heads/master@{#18170} > > > > > Committed:9756238084> > > > > > > > TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,charujain@webrtc.org > > > > # Skipping CQ checks because original CL landed less than 1 days ago. > > > > NOPRESUBMIT=true > > > > NOTREECHECKS=true > > > > NOTRY=true > > > > BUG=webrtc:4867 > > > > > > > > Review-Url: https://codereview.webrtc.org/2890733003 > > > > Cr-Commit-Position: refs/heads/master@{#18174} > > > > Committed:d51e042492> > > > > > TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,charujain@webrtc.org > > > # Skipping CQ checks because original CL landed less than 1 days ago. > > > NOPRESUBMIT=true > > > NOTREECHECKS=true > > > NOTRY=true > > > BUG=webrtc:4867 > > > > > > Review-Url: https://codereview.webrtc.org/2893593002 > > > Cr-Commit-Position: refs/heads/master@{#18182} > > > Committed:37144b214e> > > > TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,charujain@webrtc.org > > # Skipping CQ checks because original CL landed less than 1 days ago. > > NOPRESUBMIT=true > > NOTREECHECKS=true > > NOTRY=true > > BUG=webrtc:4867 > > > > Review-Url: https://codereview.webrtc.org/2893843003 > > Cr-Commit-Position: refs/heads/master@{#18303} > > Committed:580c3522d2> > TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,charujain@webrtc.org,kthelgason@webrtc.org > # Skipping CQ checks because original CL landed less than 1 days ago. > NOPRESUBMIT=true > NOTREECHECKS=true > NOTRY=true > BUG=webrtc:4867 > > Review-Url: https://codereview.webrtc.org/2911053002 > Cr-Commit-Position: refs/heads/master@{#18309} > Committed:af5c05540cTBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,charujain@webrtc.org,mbonadei@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:4867 Review-Url: https://codereview.webrtc.org/2913753003 Cr-Commit-Position: refs/heads/master@{#18319}
76 lines
2.4 KiB
Objective-C
76 lines
2.4 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 "WebRTC/RTCCameraPreviewView.h"
|
|
|
|
#import <AVFoundation/AVFoundation.h>
|
|
#import <UIKit/UIKit.h>
|
|
|
|
#import "RTCDispatcher+Private.h"
|
|
|
|
@implementation RTCCameraPreviewView
|
|
|
|
@synthesize captureSession = _captureSession;
|
|
|
|
+ (Class)layerClass {
|
|
return [AVCaptureVideoPreviewLayer class];
|
|
}
|
|
|
|
- (void)setCaptureSession:(AVCaptureSession *)captureSession {
|
|
if (_captureSession == captureSession) {
|
|
return;
|
|
}
|
|
_captureSession = captureSession;
|
|
AVCaptureVideoPreviewLayer *previewLayer = [self previewLayer];
|
|
[RTCDispatcher dispatchAsyncOnType:RTCDispatcherTypeCaptureSession
|
|
block:^{
|
|
previewLayer.session = captureSession;
|
|
}];
|
|
}
|
|
|
|
- (void)layoutSubviews {
|
|
[super layoutSubviews];
|
|
|
|
// Update the video orientation based on the device orientation.
|
|
[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 {
|
|
previewLayer.connection.videoOrientation =
|
|
AVCaptureVideoOrientationPortrait;
|
|
}
|
|
}
|
|
}
|
|
|
|
#pragma mark - Private
|
|
|
|
- (AVCaptureVideoPreviewLayer *)previewLayer {
|
|
return (AVCaptureVideoPreviewLayer *)self.layer;
|
|
}
|
|
|
|
@end
|