zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Support compiling with the lastest iOS SDK.

Browse Source 
Bug: None
Change-Id: I2bc4b4f3eba9c5f6b3a94fce076dc575c5be057d
Reviewed-on: https://webrtc-review.googlesource.com/90720
Reviewed-by: Peter Hanspers <peterhanspers@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Kári Helgason <kthelgason@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#24163}
This commit is contained in:
Kári Tristan Helgason
2018-07-27 12:34:54 +02:00
committed by Commit Bot
parent 55bf92adf4
commit 9014324bb1
5 changed files with 14 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sdk/objc/Framework/Classes/Metal/RTCMTLVideoView.m
View File

@ -92,6 +92,10 @@
#endif
}
+ (MTKView *)createMetalView:(CGRect)frame {
return [[MTKViewClass alloc] initWithFrame:frame];
}
+ (RTCMTLNV12Renderer *)createNV12Renderer {
return [[RTCMTLNV12RendererClass alloc] init];
}
@ -107,7 +111,7 @@
- (void)configure {
NSAssert([RTCMTLVideoView isMetalAvailable], @"Metal not availiable on this device");
self.metalView = [[MTKViewClass alloc] initWithFrame:self.bounds];
self.metalView = [RTCMTLVideoView createMetalView:self.bounds];
self.metalView.delegate = self;
self.metalView.contentMode = UIViewContentModeScaleAspectFill;
[self addSubview:self.metalView];
@ -194,12 +198,9 @@
- (RTCVideoRotation)frameRotation {
if (self.rotationOverride) {
RTCVideoRotation rotation;
#if defined(__IPHONE_11_0) && (__IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_11_0)
if (@available(iOS 11, *)) {
[self.rotationOverride getValue:&rotation size:sizeof(rotation)];
} else
#endif
{
} else {
[self.rotationOverride getValue:&rotation];
}
return rotation;