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

Side by Side Diff: webrtc/test/call_test.cc

Issue 2504783002: Revert of Start probes only after network is connected. (Closed)
Patch Set: Created 4 years, 1 month 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 (c) 2014 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 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 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 } 64 }
65 CreateReceiverCall(recv_config); 65 CreateReceiverCall(recv_config);
66 } 66 }
67 test->OnCallsCreated(sender_call_.get(), receiver_call_.get()); 67 test->OnCallsCreated(sender_call_.get(), receiver_call_.get());
68 receive_transport_.reset(test->CreateReceiveTransport()); 68 receive_transport_.reset(test->CreateReceiveTransport());
69 send_transport_.reset(test->CreateSendTransport(sender_call_.get())); 69 send_transport_.reset(test->CreateSendTransport(sender_call_.get()));
70 70
71 if (test->ShouldCreateReceivers()) { 71 if (test->ShouldCreateReceivers()) {
72 send_transport_->SetReceiver(receiver_call_->Receiver()); 72 send_transport_->SetReceiver(receiver_call_->Receiver());
73 receive_transport_->SetReceiver(sender_call_->Receiver()); 73 receive_transport_->SetReceiver(sender_call_->Receiver());
74 if (num_video_streams_ > 0)
75 receiver_call_->SignalChannelNetworkState(MediaType::VIDEO, kNetworkUp);
76 if (num_audio_streams_ > 0)
77 receiver_call_->SignalChannelNetworkState(MediaType::AUDIO, kNetworkUp);
78 } else { 74 } else {
79 // Sender-only call delivers to itself. 75 // Sender-only call delivers to itself.
80 send_transport_->SetReceiver(sender_call_->Receiver()); 76 send_transport_->SetReceiver(sender_call_->Receiver());
81 receive_transport_->SetReceiver(nullptr); 77 receive_transport_->SetReceiver(nullptr);
82 } 78 }
83 79
84 CreateSendConfig(num_video_streams_, num_audio_streams_, num_flexfec_streams_, 80 CreateSendConfig(num_video_streams_, num_audio_streams_, num_flexfec_streams_,
85 send_transport_.get()); 81 send_transport_.get());
86 if (test->ShouldCreateReceivers()) { 82 if (test->ShouldCreateReceivers()) {
87 CreateMatchingReceiveConfigs(receive_transport_.get()); 83 CreateMatchingReceiveConfigs(receive_transport_.get());
(...skipping 415 matching lines...) Expand 10 before | Expand all | Expand 10 after
503 499
504 EndToEndTest::EndToEndTest(unsigned int timeout_ms) : BaseTest(timeout_ms) { 500 EndToEndTest::EndToEndTest(unsigned int timeout_ms) : BaseTest(timeout_ms) {
505 } 501 }
506 502
507 bool EndToEndTest::ShouldCreateReceivers() const { 503 bool EndToEndTest::ShouldCreateReceivers() const {
508 return true; 504 return true;
509 } 505 }
510 506
511 } // namespace test 507 } // namespace test
512 } // namespace webrtc 508 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/congestion_controller/probe_controller_unittest.cc ('k') | webrtc/test/direct_transport.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698