From cbbd8c76e8a8a1cf3f1193ea50980bc9d858458d Mon Sep 17 00:00:00 2001
From: kthelgason <kthelgason@webrtc.org>
Date: Wed, 8 Mar 2017 06:54:59 -0800
Subject: [PATCH] Revert of Add Metal video view in AppRTCMobile and metal
 availability macro. (patchset #5 id:80001 of
 https://codereview.webrtc.org/2722583002/ )

Reason for revert:
Breaks AppRTCMobile

Original issue's description:
> Add Metal video view in AppRTCMobile and Metal availability macro.
>
> - The RTC_SUPPORTS_METAL macro allows consumers to gracefully handle compilation for different archs that are not supporting Metal.
>
> BUG=webrtc:7079
>
> Review-Url: https://codereview.webrtc.org/2722583002
> Cr-Commit-Position: refs/heads/master@{#17004}
> Committed: https://chromium.googlesource.com/external/webrtc/+/154a7bb877abefada22afe28b0a755cf621e8d9e

TBR=magjed@webrtc.org,tkchin@webrtc.org,denicija@webrtc.org
# Not skipping CQ checks because original CL landed more than 1 days ago.
BUG=webrtc:7079

Review-Url: https://codereview.webrtc.org/2739793003
Cr-Commit-Position: refs/heads/master@{#17119}
---
 .../objc/AppRTCMobile/ios/ARDVideoCallView.h      |  6 +++---
 .../objc/AppRTCMobile/ios/ARDVideoCallView.m      | 15 ++-------------
 .../Framework/Classes/Metal/RTCMTLVideoView.m     |  4 ++--
 .../Framework/Headers/WebRTC/RTCMTLVideoView.h    |  9 +--------
 4 files changed, 8 insertions(+), 26 deletions(-)

diff --git a/webrtc/examples/objc/AppRTCMobile/ios/ARDVideoCallView.h b/webrtc/examples/objc/AppRTCMobile/ios/ARDVideoCallView.h
index d76805f104..dec1bfcba0 100644
--- a/webrtc/examples/objc/AppRTCMobile/ios/ARDVideoCallView.h
+++ b/webrtc/examples/objc/AppRTCMobile/ios/ARDVideoCallView.h
@@ -10,8 +10,8 @@
 
 #import <UIKit/UIKit.h>
 
-#import <WebRTC/RTCCameraPreviewView.h>
-#import <WebRTC/RTCVideoRenderer.h>
+#import "WebRTC/RTCCameraPreviewView.h"
+#import "WebRTC/RTCEAGLVideoView.h"
 
 #import "ARDStatsView.h"
 
@@ -38,7 +38,7 @@
 
 @property(nonatomic, readonly) UILabel *statusLabel;
 @property(nonatomic, readonly) RTCCameraPreviewView *localVideoView;
-@property(nonatomic, readonly) __kindof UIView<RTCVideoRenderer> *remoteVideoView;
+@property(nonatomic, readonly) RTCEAGLVideoView *remoteVideoView;
 @property(nonatomic, readonly) ARDStatsView *statsView;
 @property(nonatomic, weak) id<ARDVideoCallViewDelegate> delegate;
 
diff --git a/webrtc/examples/objc/AppRTCMobile/ios/ARDVideoCallView.m b/webrtc/examples/objc/AppRTCMobile/ios/ARDVideoCallView.m
index 869d29cb6c..6e5fc597e9 100644
--- a/webrtc/examples/objc/AppRTCMobile/ios/ARDVideoCallView.m
+++ b/webrtc/examples/objc/AppRTCMobile/ios/ARDVideoCallView.m
@@ -11,10 +11,6 @@
 #import "ARDVideoCallView.h"
 
 #import <AVFoundation/AVFoundation.h>
-
-#import <WebRTC/RTCEAGLVideoView.h>
-#import <WebRTC/RTCMTLVideoView.h>
-
 #import "UIImage+ARDUtilities.h"
 
 static CGFloat const kButtonPadding = 16;
@@ -42,15 +38,8 @@ static CGFloat const kStatusBarHeight = 20;
 
 - (instancetype)initWithFrame:(CGRect)frame {
   if (self = [super initWithFrame:frame]) {
-
-#if defined(RTC_SUPPORTS_METAL)
-    _remoteVideoView = [[RTCMTLVideoView alloc] initWithFrame:CGRectZero];
-#else
-    RTCEAGLVideoView *remoteView = [[RTCEAGLVideoView alloc] initWithFrame:CGRectZero];
-    remoteView.delegate = self;
-    _remoteVideoView = remoteView;
-#endif
-
+    _remoteVideoView = [[RTCEAGLVideoView alloc] initWithFrame:CGRectZero];
+    _remoteVideoView.delegate = self;
     [self addSubview:_remoteVideoView];
 
     _localVideoView = [[RTCCameraPreviewView alloc] initWithFrame:CGRectZero];
diff --git a/webrtc/sdk/objc/Framework/Classes/Metal/RTCMTLVideoView.m b/webrtc/sdk/objc/Framework/Classes/Metal/RTCMTLVideoView.m
index 63ef23ad49..2a18736b25 100644
--- a/webrtc/sdk/objc/Framework/Classes/Metal/RTCMTLVideoView.m
+++ b/webrtc/sdk/objc/Framework/Classes/Metal/RTCMTLVideoView.m
@@ -51,9 +51,9 @@
 #pragma mark - Private
 
 + (BOOL)isMetalAvailable {
-#if defined(RTC_SUPPORTS_METAL)
+#if defined(__OBJC__) && COREVIDEO_SUPPORTS_METAL
   return YES;
-#else
+#elif
   return NO;
 #endif
 }
diff --git a/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCMTLVideoView.h b/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCMTLVideoView.h
index 49e5963fd8..681c457516 100644
--- a/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCMTLVideoView.h
+++ b/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCMTLVideoView.h
@@ -12,13 +12,8 @@
 
 #import "WebRTC/RTCVideoRenderer.h"
 
-// Check if metal is supported in WebRTC.
-// NOTE: Currently arm64 == Metal.
-#if defined(__aarch64__)
-#define RTC_SUPPORTS_METAL
-#endif
-
 NS_ASSUME_NONNULL_BEGIN
+RTC_EXPORT
 
 /**
  * RTCMTLVideoView is thin wrapper around MTKView.
@@ -27,8 +22,6 @@ NS_ASSUME_NONNULL_BEGIN
  * bounds using Metal.
  */
 NS_CLASS_AVAILABLE_IOS(9)
-
-RTC_EXPORT
 @interface RTCMTLVideoView : UIView <RTCVideoRenderer>
 
 @end