Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1066)

Side by Side Diff: webrtc/examples/objc/AppRTCDemo/mac/APPRTCViewController.m

Issue 1690313002: Update iOS AppRTCDemo to use the updated Objective-C API. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Update Mac demo and other changes after updating against master Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright 2014 The WebRTC Project Authors. All rights reserved. 2 * Copyright 2014 The WebRTC Project Authors. All rights reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #import "APPRTCViewController.h" 11 #import "APPRTCViewController.h"
12 12
13 #import <AVFoundation/AVFoundation.h> 13 #import <AVFoundation/AVFoundation.h>
14 #import "ARDAppClient.h" 14 #import "ARDAppClient.h"
15 #import "RTCNSGLVideoView.h" 15 #import "webrtc/api/objc/RTCNSGLVideoView.h"
tkchin_webrtc 2016/03/08 19:51:22 ditto move import
hjon_webrtc 2016/03/10 03:32:43 Done.
16 #import "RTCVideoTrack.h" 16 #import "webrtc/api/objc/RTCVideoTrack.h"
17 17
18 static NSUInteger const kContentWidth = 1280; 18 static NSUInteger const kContentWidth = 1280;
19 static NSUInteger const kContentHeight = 720; 19 static NSUInteger const kContentHeight = 720;
20 static NSUInteger const kRoomFieldWidth = 80; 20 static NSUInteger const kRoomFieldWidth = 80;
21 static NSUInteger const kLogViewHeight = 280; 21 static NSUInteger const kLogViewHeight = 280;
22 22
23 @class APPRTCMainView; 23 @class APPRTCMainView;
24 @protocol APPRTCMainViewDelegate 24 @protocol APPRTCMainViewDelegate
25 25
26 - (void)appRTCMainView:(APPRTCMainView*)mainView 26 - (void)appRTCMainView:(APPRTCMainView*)mainView
(...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after
243 break; 243 break;
244 case kARDAppClientStateDisconnected: 244 case kARDAppClientStateDisconnected:
245 NSLog(@"Client disconnected."); 245 NSLog(@"Client disconnected.");
246 [self resetUI]; 246 [self resetUI];
247 _client = nil; 247 _client = nil;
248 break; 248 break;
249 } 249 }
250 } 250 }
251 251
252 - (void)appClient:(ARDAppClient *)client 252 - (void)appClient:(ARDAppClient *)client
253 didChangeConnectionState:(RTCICEConnectionState)state { 253 didChangeConnectionState:(RTCIceConnectionState)state {
254 } 254 }
255 255
256 - (void)appClient:(ARDAppClient *)client 256 - (void)appClient:(ARDAppClient *)client
257 didReceiveLocalVideoTrack:(RTCVideoTrack *)localVideoTrack { 257 didReceiveLocalVideoTrack:(RTCVideoTrack *)localVideoTrack {
258 _localVideoTrack = localVideoTrack; 258 _localVideoTrack = localVideoTrack;
259 } 259 }
260 260
261 - (void)appClient:(ARDAppClient *)client 261 - (void)appClient:(ARDAppClient *)client
262 didReceiveRemoteVideoTrack:(RTCVideoTrack *)remoteVideoTrack { 262 didReceiveRemoteVideoTrack:(RTCVideoTrack *)remoteVideoTrack {
263 _remoteVideoTrack = remoteVideoTrack; 263 _remoteVideoTrack = remoteVideoTrack;
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
301 _remoteVideoTrack = nil; 301 _remoteVideoTrack = nil;
302 [self.mainView.remoteVideoView renderFrame:nil]; 302 [self.mainView.remoteVideoView renderFrame:nil];
303 } 303 }
304 304
305 - (void)disconnect { 305 - (void)disconnect {
306 [self resetUI]; 306 [self resetUI];
307 [_client disconnect]; 307 [_client disconnect];
308 } 308 }
309 309
310 @end 310 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698