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

Reland of Add Metal video view in AppRTCMobile and metal availability macro. (patchset #1 id:1 of https://codereview.webrtc.org/2739793003/ )

Browse Source 
Reason for revert:
Fixing rendering issues in AppRTCMobile

Original issue's description:
> 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: 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}
> Committed: cbbd8c76e8

TBR=magjed@webrtc.org,tkchin@webrtc.org,denicija@webrtc.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=webrtc:7079

Review-Url: https://codereview.webrtc.org/2742603003
Cr-Commit-Position: refs/heads/master@{#17139}
This commit is contained in:
kthelgason
2017-03-09 03:34:27 -08:00
committed by Commit bot
parent e47c1d3ca1
commit a2fb30c8cb
5 changed files with 34 additions and 14 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 "WebRTC/RTCCameraPreviewView.h"
#import "WebRTC/RTCEAGLVideoView.h"
#import <WebRTC/RTCCameraPreviewView.h>
#import <WebRTC/RTCVideoRenderer.h>
#import "ARDStatsView.h"
@ -38,7 +38,7 @@
@property(nonatomic, readonly) UILabel *statusLabel;
@property(nonatomic, readonly) RTCCameraPreviewView *localVideoView;
@property(nonatomic, readonly) RTCEAGLVideoView *remoteVideoView;
@property(nonatomic, readonly) __kindof UIView<RTCVideoRenderer> *remoteVideoView;
@property(nonatomic, readonly) ARDStatsView *statsView;
@property(nonatomic, weak) id<ARDVideoCallViewDelegate> delegate;

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

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