Merge branch 'mkirk/webrtc-m68'

pull/1/head
Michael Kirk 7 years ago
commit e77b798aa7

@ -1 +1 @@
Subproject commit b316e4e26362bb86605cd3743d513ea8a57e66bf Subproject commit d69c75bfcf8a7387c86f30c563f788c59b94a66f

@ -19,7 +19,7 @@ NS_ASSUME_NONNULL_BEGIN
@property (nonatomic, readonly) __kindof UIView<RTCVideoRenderer> *videoRenderer; @property (nonatomic, readonly) __kindof UIView<RTCVideoRenderer> *videoRenderer;
// Used for legacy EAGLVideoView // Used for legacy EAGLVideoView
@property (nullable, nonatomic) NSMutableArray<NSLayoutConstraint *> *remoteVideoConstraints; @property (nullable, nonatomic) NSArray<NSLayoutConstraint *> *remoteVideoConstraints;
@end @end
@ -32,6 +32,8 @@ NS_ASSUME_NONNULL_BEGIN
return self; return self;
} }
_remoteVideoConstraints = @[];
// Currently RTC only supports metal on 64bit machines // Currently RTC only supports metal on 64bit machines
#if defined(RTC_SUPPORTS_METAL) #if defined(RTC_SUPPORTS_METAL)
// On 64-bit, iOS9+: uses the MetalKit backed view for improved battery/rendering performance. // On 64-bit, iOS9+: uses the MetalKit backed view for improved battery/rendering performance.
@ -142,7 +144,7 @@ NS_ASSUME_NONNULL_BEGIN
[constraints addObjectsFromArray:[videoView autoPinEdgesToSuperviewEdges]]; [constraints addObjectsFromArray:[videoView autoPinEdgesToSuperviewEdges]];
} }
self.remoteVideoConstraints = constraints; self.remoteVideoConstraints = [constraints copy];
// We need to force relayout to occur immediately (and not // We need to force relayout to occur immediately (and not
// wait for a UIKit layout/render pass) or the remoteVideoView // wait for a UIKit layout/render pass) or the remoteVideoView
// (which presumably is updating its CALayer directly) will // (which presumably is updating its CALayer directly) will

Loading…
Cancel
Save