From 91cf0227164a70d22efbd279a6f6327f6e18af6a Mon Sep 17 00:00:00 2001
From: Michael Kirk <michael@signal.org>
Date: Thu, 20 Dec 2018 13:07:52 -0700
Subject: [PATCH] WebRTC M71

Protocol was renamed in https://chromium.googlesource.com/external/webrtc/+/416018d455bfd60ff58a3adb988bdeaec16d5ce9%5E%21/

And the RTC_SUPPORTS_METAL define was removed from RTC headers.
---
 Signal/src/views/RemoteVideoView.m | 23 +++++++++++------------
 ThirdParty/WebRTC                  |  2 +-
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/Signal/src/views/RemoteVideoView.m b/Signal/src/views/RemoteVideoView.m
index 018d35979..f0926155d 100644
--- a/Signal/src/views/RemoteVideoView.m
+++ b/Signal/src/views/RemoteVideoView.m
@@ -14,7 +14,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface RemoteVideoView () <RTCEAGLVideoViewDelegate>
+@interface RemoteVideoView () <RTCVideoViewDelegate>
 
 @property (nonatomic, readonly) __kindof UIView<RTCVideoRenderer> *videoRenderer;
 
@@ -35,7 +35,7 @@ NS_ASSUME_NONNULL_BEGIN
     _remoteVideoConstraints = @[];
 
 // Currently RTC only supports metal on 64bit machines
-#if defined(RTC_SUPPORTS_METAL)
+#if defined(__arm64__)
     // On 64-bit, iOS9+: uses the MetalKit backed view for improved battery/rendering performance.
     if (_videoRenderer == nil) {
 
@@ -59,9 +59,6 @@ NS_ASSUME_NONNULL_BEGIN
             }
         }
     }
-#elif defined(__arm64__)
-    // Canary incase the upstream RTC_SUPPORTS_METAL macro changes semantics
-    OWSFailDebug(@"should only use legacy video view on 32bit systems");
 #endif
 
     // On 32-bit iOS9+ systems, use the legacy EAGL backed view.
@@ -89,11 +86,18 @@ NS_ASSUME_NONNULL_BEGIN
     [self.videoRenderer setSize:size];
 }
 
-#pragma mark - RTCEAGLVideoViewDelegate
+#pragma mark - RTCVideoViewDelegate
 
-- (void)videoView:(RTCEAGLVideoView *)videoView didChangeVideoSize:(CGSize)remoteVideoSize
+- (void)videoView:(id<RTCVideoRenderer>)videoRenderer didChangeVideoSize:(CGSize)remoteVideoSize
 {
     OWSAssertIsOnMainThread();
+
+    if (![videoRenderer isKindOfClass:[RTCEAGLVideoView class]]) {
+        OWSFailDebug(@"Unexpected videoRenderer: %@", videoRenderer);
+        return;
+    }
+    RTCEAGLVideoView *videoView = (RTCEAGLVideoView *)videoRenderer;
+
     if (remoteVideoSize.height <= 0) {
         OWSFailDebug(@"Illegal video height: %f", remoteVideoSize.height);
         return;
@@ -112,11 +116,6 @@ NS_ASSUME_NONNULL_BEGIN
         return;
     }
 
-    if (![self.videoRenderer isKindOfClass:[RTCEAGLVideoView class]]) {
-        OWSFailDebug(@"Unexpected video renderer: %@", self.videoRenderer);
-        return;
-    }
-
     [NSLayoutConstraint deactivateConstraints:self.remoteVideoConstraints];
 
     NSMutableArray<NSLayoutConstraint *> *constraints = [NSMutableArray new];
diff --git a/ThirdParty/WebRTC b/ThirdParty/WebRTC
index ca71024b4..aa8bee9bd 160000
--- a/ThirdParty/WebRTC
+++ b/ThirdParty/WebRTC
@@ -1 +1 @@
-Subproject commit ca71024b4993ba95e3e6b8d0758004cffc54ddaf
+Subproject commit aa8bee9bd6f69e388a9ca7506b8702ef8ab7f195