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

Revert of Add Metal video view in AppRTCMobile and metal availability macro. (patchset #5 id:80001 of https://codereview.webrtc.org/2722583002/ )

Browse Source 
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: 154a7bb877

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}
This commit is contained in:
kthelgason
2017-03-08 06:54:59 -08:00
committed by Commit bot
parent 96d91524fa
commit cbbd8c76e8
4 changed files with 8 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
webrtc/examples/objc/AppRTCMobile/ios/ARDVideoCallView.h
View File

@ -10,8 +10,8 @@
#import <UIKit/UIKit.h> #import <UIKit/UIKit.h>
#import <WebRTC/RTCCameraPreviewView.h> #import "WebRTC/RTCCameraPreviewView.h"
#import <WebRTC/RTCVideoRenderer.h> #import "WebRTC/RTCEAGLVideoView.h"
#import "ARDStatsView.h" #import "ARDStatsView.h"
@ -38,7 +38,7 @@
@property(nonatomic, readonly) UILabel *statusLabel; @property(nonatomic, readonly) UILabel *statusLabel;
@property(nonatomic, readonly) RTCCameraPreviewView *localVideoView; @property(nonatomic, readonly) RTCCameraPreviewView *localVideoView;
@property(nonatomic, readonly) __kindof UIView<RTCVideoRenderer> *remoteVideoView; @property(nonatomic, readonly) RTCEAGLVideoView *remoteVideoView;
@property(nonatomic, readonly) ARDStatsView *statsView; @property(nonatomic, readonly) ARDStatsView *statsView;
@property(nonatomic, weak) id<ARDVideoCallViewDelegate> delegate; @property(nonatomic, weak) id<ARDVideoCallViewDelegate> delegate;

15
webrtc/examples/objc/AppRTCMobile/ios/ARDVideoCallView.m
View File

@ -11,10 +11,6 @@
#import "ARDVideoCallView.h" #import "ARDVideoCallView.h"
#import <AVFoundation/AVFoundation.h> #import <AVFoundation/AVFoundation.h>
#import <WebRTC/RTCEAGLVideoView.h>
#import <WebRTC/RTCMTLVideoView.h>
#import "UIImage+ARDUtilities.h" #import "UIImage+ARDUtilities.h"
static CGFloat const kButtonPadding = 16; static CGFloat const kButtonPadding = 16;
@ -42,15 +38,8 @@ static CGFloat const kStatusBarHeight = 20;
- (instancetype)initWithFrame:(CGRect)frame { - (instancetype)initWithFrame:(CGRect)frame {
if (self = [super initWithFrame:frame]) { if (self = [super initWithFrame:frame]) {
_remoteVideoView = [[RTCEAGLVideoView alloc] initWithFrame:CGRectZero];
#if defined(RTC_SUPPORTS_METAL) _remoteVideoView.delegate = self;
_remoteVideoView = [[RTCMTLVideoView alloc] initWithFrame:CGRectZero];
#else
RTCEAGLVideoView *remoteView = [[RTCEAGLVideoView alloc] initWithFrame:CGRectZero];
remoteView.delegate = self;
_remoteVideoView = remoteView;
#endif
[self addSubview:_remoteVideoView]; [self addSubview:_remoteVideoView];
_localVideoView = [[RTCCameraPreviewView alloc] initWithFrame:CGRectZero]; _localVideoView = [[RTCCameraPreviewView alloc] initWithFrame:CGRectZero];

4
webrtc/sdk/objc/Framework/Classes/Metal/RTCMTLVideoView.m
View File

@ -51,9 +51,9 @@
#pragma mark - Private #pragma mark - Private
+ (BOOL)isMetalAvailable { + (BOOL)isMetalAvailable {
#if defined(RTC_SUPPORTS_METAL) #if defined(__OBJC__) && COREVIDEO_SUPPORTS_METAL
return YES; return YES;
#else #elif
return NO; return NO;
#endif #endif
} }

9
webrtc/sdk/objc/Framework/Headers/WebRTC/RTCMTLVideoView.h
View File

@ -12,13 +12,8 @@
#import "WebRTC/RTCVideoRenderer.h" #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 NS_ASSUME_NONNULL_BEGIN
RTC_EXPORT
/** /**
* RTCMTLVideoView is thin wrapper around MTKView. * RTCMTLVideoView is thin wrapper around MTKView.
@ -27,8 +22,6 @@ NS_ASSUME_NONNULL_BEGIN
* bounds using Metal. * bounds using Metal.
*/ */
NS_CLASS_AVAILABLE_IOS(9) NS_CLASS_AVAILABLE_IOS(9)
RTC_EXPORT
@interface RTCMTLVideoView : UIView <RTCVideoRenderer> @interface RTCMTLVideoView : UIView <RTCVideoRenderer>
@end @end