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

Side by Side Diff: webrtc/api/webrtcsession_unittest.cc

Issue 2224563004: Add signaling to support ICE renomination. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: Update comments and merge Created 4 years, 4 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 520 matching lines...) Expand 10 before | Expand all | Expand 10 after
531 if (data_channel_ && session_->data_channel_type() == cricket::DCT_RTP) { 531 if (data_channel_ && session_->data_channel_type() == cricket::DCT_RTP) {
532 session_options->AddSendStream(cricket::MEDIA_TYPE_DATA, 532 session_options->AddSendStream(cricket::MEDIA_TYPE_DATA,
533 data_channel_->label(), 533 data_channel_->label(),
534 data_channel_->label()); 534 data_channel_->label());
535 } 535 }
536 } 536 }
537 537
538 void GetOptionsForOffer( 538 void GetOptionsForOffer(
539 const PeerConnectionInterface::RTCOfferAnswerOptions& rtc_options, 539 const PeerConnectionInterface::RTCOfferAnswerOptions& rtc_options,
540 cricket::MediaSessionOptions* session_options) { 540 cricket::MediaSessionOptions* session_options) {
541 ASSERT_TRUE(ExtractMediaSessionOptions(rtc_options, true, session_options)); 541 ASSERT_TRUE(
542 ExtractMediaSessionOptions(rtc_options, true, false, session_options));
542 543
543 AddStreamsToOptions(session_options); 544 AddStreamsToOptions(session_options);
544 if (rtc_options.offer_to_receive_audio == 545 if (rtc_options.offer_to_receive_audio ==
545 RTCOfferAnswerOptions::kUndefined) { 546 RTCOfferAnswerOptions::kUndefined) {
546 session_options->recv_audio = 547 session_options->recv_audio =
547 session_options->HasSendMediaStream(cricket::MEDIA_TYPE_AUDIO); 548 session_options->HasSendMediaStream(cricket::MEDIA_TYPE_AUDIO);
548 } 549 }
549 if (rtc_options.offer_to_receive_video == 550 if (rtc_options.offer_to_receive_video ==
550 RTCOfferAnswerOptions::kUndefined) { 551 RTCOfferAnswerOptions::kUndefined) {
551 session_options->recv_video = 552 session_options->recv_video =
(...skipping 3793 matching lines...) Expand 10 before | Expand all | Expand 10 after
4345 } 4346 }
4346 4347
4347 // TODO(bemasc): Add a TestIceStatesBundle with BUNDLE enabled. That test 4348 // TODO(bemasc): Add a TestIceStatesBundle with BUNDLE enabled. That test
4348 // currently fails because upon disconnection and reconnection OnIceComplete is 4349 // currently fails because upon disconnection and reconnection OnIceComplete is
4349 // called more than once without returning to IceGatheringGathering. 4350 // called more than once without returning to IceGatheringGathering.
4350 4351
4351 INSTANTIATE_TEST_CASE_P(WebRtcSessionTests, 4352 INSTANTIATE_TEST_CASE_P(WebRtcSessionTests,
4352 WebRtcSessionTest, 4353 WebRtcSessionTest,
4353 testing::Values(ALREADY_GENERATED, 4354 testing::Values(ALREADY_GENERATED,
4354 DTLS_IDENTITY_STORE)); 4355 DTLS_IDENTITY_STORE));
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698