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

Side by Side Diff: webrtc/pc/peerconnection_integrationtest.cc

Issue 2808913003: Add "ice-option:trickle" to generated offers/answers. (Closed)
Patch Set: Created 3 years, 8 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 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 2441 matching lines...) Expand 10 before | Expand all | Expand 10 after
2452 // Do normal offer/answer and wait for some frames to be received in each 2452 // Do normal offer/answer and wait for some frames to be received in each
2453 // direction. 2453 // direction.
2454 caller()->AddAudioVideoMediaStream(); 2454 caller()->AddAudioVideoMediaStream();
2455 callee()->AddAudioVideoMediaStream(); 2455 callee()->AddAudioVideoMediaStream();
2456 caller()->CreateAndSetAndSignalOffer(); 2456 caller()->CreateAndSetAndSignalOffer();
2457 ASSERT_TRUE_WAIT(SignalingStateStable(), kDefaultTimeout); 2457 ASSERT_TRUE_WAIT(SignalingStateStable(), kDefaultTimeout);
2458 // Sanity check that ICE renomination was actually negotiated. 2458 // Sanity check that ICE renomination was actually negotiated.
2459 const cricket::SessionDescription* desc = 2459 const cricket::SessionDescription* desc =
2460 caller()->pc()->local_description()->description(); 2460 caller()->pc()->local_description()->description();
2461 for (const cricket::TransportInfo& info : desc->transport_infos()) { 2461 for (const cricket::TransportInfo& info : desc->transport_infos()) {
2462 ASSERT_NE(info.description.transport_options.end(), 2462 ASSERT_NE(
2463 std::find(info.description.transport_options.begin(), 2463 info.description.transport_options.end(),
2464 info.description.transport_options.end(), 2464 std::find(info.description.transport_options.begin(),
2465 cricket::ICE_RENOMINATION_STR)); 2465 info.description.transport_options.end(), "renomination"));
2466 } 2466 }
2467 desc = callee()->pc()->local_description()->description(); 2467 desc = callee()->pc()->local_description()->description();
2468 for (const cricket::TransportInfo& info : desc->transport_infos()) { 2468 for (const cricket::TransportInfo& info : desc->transport_infos()) {
2469 ASSERT_NE(info.description.transport_options.end(), 2469 ASSERT_NE(
2470 std::find(info.description.transport_options.begin(), 2470 info.description.transport_options.end(),
2471 info.description.transport_options.end(), 2471 std::find(info.description.transport_options.begin(),
2472 cricket::ICE_RENOMINATION_STR)); 2472 info.description.transport_options.end(), "renomination"));
2473 } 2473 }
2474 ExpectNewFramesReceivedWithWait( 2474 ExpectNewFramesReceivedWithWait(
2475 kDefaultExpectedAudioFrameCount, kDefaultExpectedVideoFrameCount, 2475 kDefaultExpectedAudioFrameCount, kDefaultExpectedVideoFrameCount,
2476 kDefaultExpectedAudioFrameCount, kDefaultExpectedVideoFrameCount, 2476 kDefaultExpectedAudioFrameCount, kDefaultExpectedVideoFrameCount,
2477 kMaxWaitForFramesMs); 2477 kMaxWaitForFramesMs);
2478 } 2478 }
2479 2479
2480 // This test sets up a call between two parties with audio and video. It then 2480 // This test sets up a call between two parties with audio and video. It then
2481 // renegotiates setting the video m-line to "port 0", then later renegotiates 2481 // renegotiates setting the video m-line to "port 0", then later renegotiates
2482 // again, enabling video. 2482 // again, enabling video.
(...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after
2769 2769
2770 auto contributing_sources = receiver->GetSources(); 2770 auto contributing_sources = receiver->GetSources();
2771 ASSERT_GT(receiver->GetParameters().encodings.size(), 0u); 2771 ASSERT_GT(receiver->GetParameters().encodings.size(), 0u);
2772 EXPECT_EQ(receiver->GetParameters().encodings[0].ssrc, 2772 EXPECT_EQ(receiver->GetParameters().encodings[0].ssrc,
2773 contributing_sources[0].source_id()); 2773 contributing_sources[0].source_id());
2774 } 2774 }
2775 2775
2776 } // namespace 2776 } // namespace
2777 2777
2778 #endif // if !defined(THREAD_SANITIZER) 2778 #endif // if !defined(THREAD_SANITIZER)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698