OLD | NEW |
1 /* | 1 /* |
2 * Copyright 2012 The WebRTC project authors. All Rights Reserved. | 2 * Copyright 2012 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 2490 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2501 // Do normal offer/answer and wait for some frames to be received in each | 2501 // Do normal offer/answer and wait for some frames to be received in each |
2502 // direction. | 2502 // direction. |
2503 caller()->AddAudioVideoMediaStream(); | 2503 caller()->AddAudioVideoMediaStream(); |
2504 callee()->AddAudioVideoMediaStream(); | 2504 callee()->AddAudioVideoMediaStream(); |
2505 caller()->CreateAndSetAndSignalOffer(); | 2505 caller()->CreateAndSetAndSignalOffer(); |
2506 ASSERT_TRUE_WAIT(SignalingStateStable(), kDefaultTimeout); | 2506 ASSERT_TRUE_WAIT(SignalingStateStable(), kDefaultTimeout); |
2507 // Sanity check that ICE renomination was actually negotiated. | 2507 // Sanity check that ICE renomination was actually negotiated. |
2508 const cricket::SessionDescription* desc = | 2508 const cricket::SessionDescription* desc = |
2509 caller()->pc()->local_description()->description(); | 2509 caller()->pc()->local_description()->description(); |
2510 for (const cricket::TransportInfo& info : desc->transport_infos()) { | 2510 for (const cricket::TransportInfo& info : desc->transport_infos()) { |
2511 ASSERT_NE(info.description.transport_options.end(), | 2511 ASSERT_NE( |
2512 std::find(info.description.transport_options.begin(), | 2512 info.description.transport_options.end(), |
2513 info.description.transport_options.end(), | 2513 std::find(info.description.transport_options.begin(), |
2514 cricket::ICE_RENOMINATION_STR)); | 2514 info.description.transport_options.end(), "renomination")); |
2515 } | 2515 } |
2516 desc = callee()->pc()->local_description()->description(); | 2516 desc = callee()->pc()->local_description()->description(); |
2517 for (const cricket::TransportInfo& info : desc->transport_infos()) { | 2517 for (const cricket::TransportInfo& info : desc->transport_infos()) { |
2518 ASSERT_NE(info.description.transport_options.end(), | 2518 ASSERT_NE( |
2519 std::find(info.description.transport_options.begin(), | 2519 info.description.transport_options.end(), |
2520 info.description.transport_options.end(), | 2520 std::find(info.description.transport_options.begin(), |
2521 cricket::ICE_RENOMINATION_STR)); | 2521 info.description.transport_options.end(), "renomination")); |
2522 } | 2522 } |
2523 ExpectNewFramesReceivedWithWait( | 2523 ExpectNewFramesReceivedWithWait( |
2524 kDefaultExpectedAudioFrameCount, kDefaultExpectedVideoFrameCount, | 2524 kDefaultExpectedAudioFrameCount, kDefaultExpectedVideoFrameCount, |
2525 kDefaultExpectedAudioFrameCount, kDefaultExpectedVideoFrameCount, | 2525 kDefaultExpectedAudioFrameCount, kDefaultExpectedVideoFrameCount, |
2526 kMaxWaitForFramesMs); | 2526 kMaxWaitForFramesMs); |
2527 } | 2527 } |
2528 | 2528 |
2529 // This test sets up a call between two parties with audio and video. It then | 2529 // This test sets up a call between two parties with audio and video. It then |
2530 // renegotiates setting the video m-line to "port 0", then later renegotiates | 2530 // renegotiates setting the video m-line to "port 0", then later renegotiates |
2531 // again, enabling video. | 2531 // again, enabling video. |
(...skipping 318 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2850 caller()->CreateAndSetAndSignalOffer(); | 2850 caller()->CreateAndSetAndSignalOffer(); |
2851 ASSERT_TRUE_WAIT(SignalingStateStable(), kDefaultTimeout); | 2851 ASSERT_TRUE_WAIT(SignalingStateStable(), kDefaultTimeout); |
2852 // Wait for additional audio frames to be received by the callee. | 2852 // Wait for additional audio frames to be received by the callee. |
2853 ExpectNewFramesReceivedWithWait(0, 0, kDefaultExpectedAudioFrameCount, 0, | 2853 ExpectNewFramesReceivedWithWait(0, 0, kDefaultExpectedAudioFrameCount, 0, |
2854 kMaxWaitForFramesMs); | 2854 kMaxWaitForFramesMs); |
2855 } | 2855 } |
2856 | 2856 |
2857 } // namespace | 2857 } // namespace |
2858 | 2858 |
2859 #endif // if !defined(THREAD_SANITIZER) | 2859 #endif // if !defined(THREAD_SANITIZER) |
OLD | NEW |