oxen-io
/
session-ios
mirror of https://github.com/oxen-io/session-ios.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix AspectRatio on legacy video view 

// FREEBIE
This commit is contained in:
Michael Kirk 2017-10-04 16:36:31 -04:00
parent c3dc8508ab
commit 15f6135639
5 changed files with 97 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Signal/src/UIView+OWS.h
View File

@ -36,6 +36,7 @@ CGFloat ScaleFromIPhone5(CGFloat iPhone5Value);
- (void)autoPinHeightToHeightOfView:(UIView *)view;
- (NSLayoutConstraint *)autoPinToSquareAspectRatio;
- (NSLayoutConstraint *)autoPinToAspectRatio:(CGFloat)ratio;
#pragma mark - Content Hugging and Compression Resistance

7
Signal/src/UIView+OWS.m
View File

@ -99,6 +99,11 @@ CGFloat ScaleFromIPhone5(CGFloat iPhone5Value)
}
- (NSLayoutConstraint *)autoPinToSquareAspectRatio
{
return [self autoPinToAspectRatio:1.0];
}
- (NSLayoutConstraint *)autoPinToAspectRatio:(CGFloat)ratio
{
self.translatesAutoresizingMaskIntoConstraints = NO;
@ -107,7 +112,7 @@ CGFloat ScaleFromIPhone5(CGFloat iPhone5Value)
relatedBy:NSLayoutRelationEqual
toItem:self
attribute:NSLayoutAttributeHeight
multiplier:1.f
multiplier:ratio
constant:0.f];
[constraint autoInstall];
return constraint;

1
Signal/src/ViewControllers/CallViewController.swift
View File

@ -589,7 +589,6 @@ class CallViewController: OWSViewController, CallObserver, CallServiceObserver {
internal func updateRemoteVideoLayout() {
remoteVideoView.isHidden = !self.hasRemoteVideoTrack
self.remoteVideoView.setSize(self.view.frame.size)
updateCallUI(callState: call.state)
}

4
Signal/src/views/RemoteVideoView.h
View File

@ -4,6 +4,8 @@
#import <WebRTC/RTCVideoRenderer.h>
NS_ASSUME_NONNULL_BEGIN
/**
* Drives the full screen remote video. This is *not* a swift class
* so we can take advantage of some compile time constants from WebRTC
@ -11,3 +13,5 @@
@interface RemoteVideoView : UIView <RTCVideoRenderer>
@end
NS_ASSUME_NONNULL_END

113
Signal/src/views/RemoteVideoView.m
View File

@ -7,14 +7,16 @@
#import "UIView+OWS.h"
#import <MetalKit/MetalKit.h>
#import <PureLayout/PureLayout.h>
#import <SignalServiceKit/Threading.h>
#import <WebRTC/RTCEAGLVideoView.h>
#import <WebRTC/RTCMTLVideoView.h>
#import <WebRTC/RTCVideoRenderer.h>
NS_ASSUME_NONNULL_BEGIN
// As of RTC M61, iOS8 crashes when ending call while de-alloc'ing the EAGLVideoView
// WebRTC doesn't seem to support iOS8 - e.g. their Podfile requires iOS9+
// As of RTC M61, iOS8 crashes when ending calls while de-alloc'ing the EAGLVideoView.
// WebRTC doesn't seem to support iOS8 - e.g. their Podfile requires iOS9+, and they
// unconditionally require MetalKit on a 64bit iOS8 device (which crashes).
// Until WebRTC supports iOS8, we show a "upgrade iOS to see remote video" view
// to our few remaining iOS8 users
@interface NullVideoRenderer : UIView <RTCVideoRenderer>
@ -63,11 +65,13 @@ NS_ASSUME_NONNULL_BEGIN
@end
@interface RemoteVideoView () <RTCEAGLVideoViewDelegate>
@property (nonatomic, readonly) __kindof UIView<RTCVideoRenderer> *videoRenderer;
// Used for legacy EAGLVideoView
@property (nullable, nonatomic) NSMutableArray<NSLayoutConstraint *> *remoteVideoConstraints;
@end
@implementation RemoteVideoView
@ -82,44 +86,46 @@ NS_ASSUME_NONNULL_BEGIN
// On iOS8: prints a message saying the feature is unavailable.
if (!SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(9, 0)) {
_videoRenderer = [NullVideoRenderer new];
[self addSubview:_videoRenderer];
[_videoRenderer autoPinEdgesToSuperviewEdges];
}
// On 64-bit, iOS9+: uses the MetalKit backed view for improved battery/rendering performance.
if (_videoRenderer == nil) {
// Currently RTC only supports metal on 64bit machines
#if defined(RTC_SUPPORTS_METAL)
// RTCMTLVideoView requires the MTKView class, available in the iOS9+ MetalKit framework
if ([MTKView class]) {
_videoRenderer = [[RTCMTLVideoView alloc] initWithFrame:CGRectZero];
}
#endif
}
// On 32-bit: uses the legacy EAGL backed view.
// On 64-bit, iOS9+: uses the MetalKit backed view for improved battery/rendering performance.
if (_videoRenderer == nil) {
OWSAssert(!__arm64__);
RTCEAGLVideoView *eaglVideoView = [[RTCEAGLVideoView alloc] initWithFrame:CGRectZero];
// It is insufficient to check the RTC_SUPPORTS_METAL macro to determine Metal support.
// RTCMTLVideoView requires the MTKView class, available only in iOS9+
// So check that it exists before proceeding.
if ([MTKView class]) {
_videoRenderer = [[RTCMTLVideoView alloc] initWithFrame:CGRectZero];
[self addSubview:_videoRenderer];
[_videoRenderer autoPinEdgesToSuperviewEdges];
}
}
#elif defined(__arm64__)
// Canary incase the upstream RTC_SUPPORTS_METAL macro changes semantics
OWSFail(@"should only use legacy video view on 32bit systems");
#endif
// On 32-bit iOS9+ systems, use the legacy EAGL backed view.
if (_videoRenderer == nil) {
RTCEAGLVideoView *eaglVideoView = [RTCEAGLVideoView new];
eaglVideoView.delegate = self;
_videoRenderer = eaglVideoView;
[self addSubview:_videoRenderer];
// Pinning legacy RTCEAGL view discards aspect ratio.
// So we have a more verbose layout in the RTCEAGLVideoViewDelegate methods
// [_videoRenderer autoPinEdgesToSuperviewEdges];
}
[self addSubview:_videoRenderer];
// We want the rendered video to go edge-to-edge.
_videoRenderer.layoutMargins = UIEdgeInsetsZero;
[_videoRenderer autoPinEdgesToSuperviewEdges];
return self;
}
#pragma mark - RTCEAGLVideoViewDelegate
- (void)videoView:(RTCEAGLVideoView *)videoView didChangeVideoSize:(CGSize)size
{
// Do nothing. In older versions of WebRTC we used this to fit the video to fullscreen,
// but now we use the RTCVideoRenderer.setSize.
// However setting a delegate is *required* when using EAGL view.
}
#pragma mark - RTCVideoRenderer
/** The size of the frame. */
@ -128,6 +134,59 @@ NS_ASSUME_NONNULL_BEGIN
[self.videoRenderer setSize:size];
}
#pragma mark - RTCEAGLVideoViewDelegate
- (void)videoView:(RTCEAGLVideoView *)videoView didChangeVideoSize:(CGSize)remoteVideoSize
{
AssertIsOnMainThread();
CGFloat aspectRatio = remoteVideoSize.width / remoteVideoSize.height;
DDLogVerbose(@"%@ Remote video size: width: %f height: %f ratio: %f",
self.logTag,
remoteVideoSize.width,
remoteVideoSize.height,
aspectRatio);
UIView *containingView = self.superview;
if (containingView == nil) {
DDLogDebug(@"%@ Cannot layout video view without superview", self.logTag);
return;
}
if (![self.videoRenderer isKindOfClass:[RTCEAGLVideoView class]]) {
OWSFail(@"%@ Unexpected video renderer: %@", self.logTag, self.videoRenderer);
return;
}
[NSLayoutConstraint deactivateConstraints:self.remoteVideoConstraints];
NSMutableArray<NSLayoutConstraint *> *constraints = [NSMutableArray new];
if (remoteVideoSize.width > 0 && remoteVideoSize.height > 0 && containingView.bounds.size.width > 0
&& containingView.bounds.size.height > 0) {
[constraints addObject:[videoView autoPinToAspectRatio:aspectRatio]];
[constraints addObject:[videoView autoSetDimension:ALDimensionWidth
toSize:containingView.width
relation:NSLayoutRelationGreaterThanOrEqual]];
[constraints addObject:[videoView autoSetDimension:ALDimensionHeight
toSize:containingView.height
relation:NSLayoutRelationGreaterThanOrEqual]];
[constraints addObjectsFromArray:[videoView autoCenterInSuperview]];
} else {
[constraints addObjectsFromArray:[videoView autoPinEdgesToSuperviewEdges]];
}
self.remoteVideoConstraints = constraints;
// We need to force relayout to occur immediately (and not
// wait for a UIKit layout/render pass) or the remoteVideoView
// (which presumably is updating its CALayer directly) will
// ocassionally appear to have bad frames.
[videoView setNeedsLayout];
[[videoView superview] setNeedsLayout];
[videoView layoutIfNeeded];
[[videoView superview] layoutIfNeeded];
}
/** The frame to be displayed. */
- (void)renderFrame:(nullable RTCVideoFrame *)frame
{