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

Side by Side Diff: webrtc/test/direct_transport.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
« no previous file with comments | « webrtc/test/call_test.cc ('k') | webrtc/video/end_to_end_tests.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2013 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 #include "webrtc/test/direct_transport.h" 10 #include "webrtc/test/direct_transport.h"
(...skipping 10 matching lines...) Expand all
21 21
22 DirectTransport::DirectTransport(const FakeNetworkPipe::Config& config, 22 DirectTransport::DirectTransport(const FakeNetworkPipe::Config& config,
23 Call* send_call) 23 Call* send_call)
24 : send_call_(send_call), 24 : send_call_(send_call),
25 packet_event_(false, false), 25 packet_event_(false, false),
26 thread_(NetworkProcess, this, "NetworkProcess"), 26 thread_(NetworkProcess, this, "NetworkProcess"),
27 clock_(Clock::GetRealTimeClock()), 27 clock_(Clock::GetRealTimeClock()),
28 shutting_down_(false), 28 shutting_down_(false),
29 fake_network_(clock_, config) { 29 fake_network_(clock_, config) {
30 thread_.Start(); 30 thread_.Start();
31 if (send_call_) {
32 send_call_->SignalChannelNetworkState(MediaType::AUDIO, kNetworkUp);
33 send_call_->SignalChannelNetworkState(MediaType::VIDEO, kNetworkUp);
34 }
35 } 31 }
36 32
37 DirectTransport::~DirectTransport() { StopSending(); } 33 DirectTransport::~DirectTransport() { StopSending(); }
38 34
39 void DirectTransport::SetConfig(const FakeNetworkPipe::Config& config) { 35 void DirectTransport::SetConfig(const FakeNetworkPipe::Config& config) {
40 fake_network_.SetConfig(config); 36 fake_network_.SetConfig(config);
41 } 37 }
42 38
43 void DirectTransport::StopSending() { 39 void DirectTransport::StopSending() {
44 { 40 {
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 fake_network_.Process(); 81 fake_network_.Process();
86 int64_t wait_time_ms = fake_network_.TimeUntilNextProcess(); 82 int64_t wait_time_ms = fake_network_.TimeUntilNextProcess();
87 if (wait_time_ms > 0) { 83 if (wait_time_ms > 0) {
88 packet_event_.Wait(static_cast<int>(wait_time_ms)); 84 packet_event_.Wait(static_cast<int>(wait_time_ms));
89 } 85 }
90 rtc::CritScope crit(&lock_); 86 rtc::CritScope crit(&lock_);
91 return shutting_down_ ? false : true; 87 return shutting_down_ ? false : true;
92 } 88 }
93 } // namespace test 89 } // namespace test
94 } // namespace webrtc 90 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/test/call_test.cc ('k') | webrtc/video/end_to_end_tests.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698