| 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 265 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 276 [answererConnectionExpectation fulfill]; | 276 [answererConnectionExpectation fulfill]; |
| 277 }]; | 277 }]; |
| 278 // TODO(tkchin): Figure out why DTLS-SRTP constraint causes thread assertion | 278 // TODO(tkchin): Figure out why DTLS-SRTP constraint causes thread assertion |
| 279 // crash in Debug. | 279 // crash in Debug. |
| 280 answerer.defaultPeerConnectionConstraints = | 280 answerer.defaultPeerConnectionConstraints = |
| 281 [[RTCMediaConstraints alloc] initWithMandatoryConstraints:nil | 281 [[RTCMediaConstraints alloc] initWithMandatoryConstraints:nil |
| 282 optionalConstraints:nil]; | 282 optionalConstraints:nil]; |
| 283 weakAnswerer = answerer; | 283 weakAnswerer = answerer; |
| 284 | 284 |
| 285 // Kick off connection. | 285 // Kick off connection. |
| 286 [caller connectToRoomWithId:roomId isLoopback:NO isAudioOnly:NO]; | 286 [caller connectToRoomWithId:roomId isLoopback:NO isAudioOnly:NO shouldMakeAecD
ump:NO]; |
| 287 [answerer connectToRoomWithId:roomId isLoopback:NO isAudioOnly:NO]; | 287 [answerer connectToRoomWithId:roomId isLoopback:NO isAudioOnly:NO shouldMakeAe
cDump:NO]; |
| 288 [self waitForExpectationsWithTimeout:20 handler:^(NSError *error) { | 288 [self waitForExpectationsWithTimeout:20 handler:^(NSError *error) { |
| 289 if (error) { | 289 if (error) { |
| 290 NSLog(@"Expectations error: %@", error); | 290 NSLog(@"Expectations error: %@", error); |
| 291 } | 291 } |
| 292 }]; | 292 }]; |
| 293 } | 293 } |
| 294 | 294 |
| 295 @end | 295 @end |
| 296 | 296 |
| 297 @interface ARDSDPUtilsTest : ARDTestCase | 297 @interface ARDSDPUtilsTest : ARDTestCase |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 333 } | 333 } |
| 334 | 334 |
| 335 TEST_F(SignalingTest, SDPTest) { | 335 TEST_F(SignalingTest, SDPTest) { |
| 336 @autoreleasepool { | 336 @autoreleasepool { |
| 337 ARDSDPUtilsTest *test = [[ARDSDPUtilsTest alloc] init]; | 337 ARDSDPUtilsTest *test = [[ARDSDPUtilsTest alloc] init]; |
| 338 [test testPreferVideoCodec]; | 338 [test testPreferVideoCodec]; |
| 339 } | 339 } |
| 340 } | 340 } |
| 341 | 341 |
| 342 | 342 |
| OLD | NEW |