Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 |
| (...skipping 351 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 362 - (void)appRTCMainView:(APPRTCMainView*)mainView | 362 - (void)appRTCMainView:(APPRTCMainView*)mainView |
| 363 didEnterRoomId:(NSString*)roomId | 363 didEnterRoomId:(NSString*)roomId |
| 364 loopback:(BOOL)isLoopback { | 364 loopback:(BOOL)isLoopback { |
| 365 | 365 |
| 366 if ([roomId isEqualToString:@""]) { | 366 if ([roomId isEqualToString:@""]) { |
| 367 [self.mainView displayLogMessage:@"Missing room id"]; | 367 [self.mainView displayLogMessage:@"Missing room id"]; |
| 368 return; | 368 return; |
| 369 } | 369 } |
| 370 | 370 |
| 371 [_client disconnect]; | 371 [_client disconnect]; |
| 372 ARDAppClient *client = [[ARDAppClient alloc] initWithDelegate:self | 372 ARDAppClient* client = [[ARDAppClient alloc] initWithDelegate:self]; |
| 373 preferVideoCodec:@"H264"]; | |
| 374 [client connectToRoomWithId:roomId | 373 [client connectToRoomWithId:roomId |
| 374 usingSettings:[[ARDSettingsModel alloc] init] | |
|
daniela-webrtc
2017/03/26 15:49:48
Maybe passing nil here for the settings parameter
sakal
2017/03/27 13:34:24
The reason I do it this way is that I want to use
daniela-webrtc
2017/03/27 13:49:07
Acknowledged.
| |
| 375 isLoopback:isLoopback | 375 isLoopback:isLoopback |
| 376 isAudioOnly:NO | 376 isAudioOnly:NO |
| 377 shouldMakeAecDump:NO | 377 shouldMakeAecDump:NO |
| 378 shouldUseLevelControl:NO]; | 378 shouldUseLevelControl:NO]; |
| 379 _client = client; | 379 _client = client; |
| 380 } | 380 } |
| 381 | 381 |
| 382 #pragma mark - Private | 382 #pragma mark - Private |
| 383 | 383 |
| 384 - (APPRTCMainView*)mainView { | 384 - (APPRTCMainView*)mainView { |
| (...skipping 14 matching lines...) Expand all Loading... | |
| 399 [self.mainView.remoteVideoView renderFrame:nil]; | 399 [self.mainView.remoteVideoView renderFrame:nil]; |
| 400 [self.mainView.localVideoView renderFrame:nil]; | 400 [self.mainView.localVideoView renderFrame:nil]; |
| 401 } | 401 } |
| 402 | 402 |
| 403 - (void)disconnect { | 403 - (void)disconnect { |
| 404 [self resetUI]; | 404 [self resetUI]; |
| 405 [_client disconnect]; | 405 [_client disconnect]; |
| 406 } | 406 } |
| 407 | 407 |
| 408 @end | 408 @end |
| OLD | NEW |