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

Side by Side Diff: webrtc/modules/pacing/bitrate_prober.cc

Issue 2033073002: BitrateProber now correctly change state to kWait when the last probing (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 6 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 (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 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 // There is no point in trying to probe with less than 1 ms between packets 115 // There is no point in trying to probe with less than 1 ms between packets
116 // as it essentially means trying to probe at infinite bandwidth. 116 // as it essentially means trying to probe at infinite bandwidth.
117 const int kMinProbeDeltaMs = 1; 117 const int kMinProbeDeltaMs = 1;
118 // If we have waited more than 3 ms for a new packet to probe with we will 118 // If we have waited more than 3 ms for a new packet to probe with we will
119 // consider this probing session over. 119 // consider this probing session over.
120 const int kMaxProbeDelayMs = 3; 120 const int kMaxProbeDelayMs = 3;
121 if (next_delta_ms < kMinProbeDeltaMs || 121 if (next_delta_ms < kMinProbeDeltaMs ||
122 time_until_probe_ms < -kMaxProbeDelayMs) { 122 time_until_probe_ms < -kMaxProbeDelayMs) {
123 // We currently disable probing after the first probe, as we only want 123 // We currently disable probing after the first probe, as we only want
124 // to probe at the beginning of a connection. We should set this to 124 // to probe at the beginning of a connection. We should set this to
125 // kWait if we later want to probe periodically. 125 // kWait if we later want to probe periodically.
stefan-webrtc 2016/06/02 15:58:14 Maybe change this comment?
126 probing_state_ = kWait; 126 probing_state_ = kWait;
127 LOG(LS_INFO) << "Next delta too small, stop probing."; 127 LOG(LS_INFO) << "Next delta too small, stop probing.";
128 time_until_probe_ms = 0; 128 time_until_probe_ms = 0;
129 } 129 }
130 } 130 }
131 return std::max(time_until_probe_ms, 0); 131 return std::max(time_until_probe_ms, 0);
132 } 132 }
133 133
134 int BitrateProber::CurrentClusterId() const { 134 int BitrateProber::CurrentClusterId() const {
135 RTC_DCHECK(!clusters_.empty()); 135 RTC_DCHECK(!clusters_.empty());
(...skipping 11 matching lines...) Expand all
147 return; 147 return;
148 packet_size_last_send_ = packet_size; 148 packet_size_last_send_ = packet_size;
149 time_last_send_ms_ = now_ms; 149 time_last_send_ms_ = now_ms;
150 if (probing_state_ != kProbing) 150 if (probing_state_ != kProbing)
151 return; 151 return;
152 if (!clusters_.empty()) { 152 if (!clusters_.empty()) {
153 ProbeCluster* cluster = &clusters_.front(); 153 ProbeCluster* cluster = &clusters_.front();
154 ++cluster->sent_probe_packets; 154 ++cluster->sent_probe_packets;
155 if (cluster->sent_probe_packets == cluster->max_probe_packets) 155 if (cluster->sent_probe_packets == cluster->max_probe_packets)
156 clusters_.pop(); 156 clusters_.pop();
157 if (clusters_.empty())
158 probing_state_ = kWait;
157 } 159 }
158 } 160 }
159 } // namespace webrtc 161 } // namespace webrtc
OLDNEW
« no previous file with comments | « no previous file | webrtc/modules/pacing/paced_sender.cc » ('j') | webrtc/modules/pacing/paced_sender_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698