zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup of CongestionWindowDownlinkDelay trial.

Browse Source 
Bug: webrtc:9883
Change-Id: If77fdad610149c01d72891d4a9f61b61006b21ce
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/138827
Reviewed-by: Ying Wang <yinwa@webrtc.org>
Commit-Queue: Sebastian Jansson <srte@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#28087}
This commit is contained in:
Sebastian Jansson
2019-05-28 11:11:43 +02:00
committed by Commit Bot
parent 9ab520e24b
commit 0b97e177e1
2 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
modules/congestion_controller/goog_cc/goog_cc_network_control.cc
View File

@ -224,14 +224,10 @@ NetworkControlUpdate GoogCcNetworkController::OnProcessInterval(
update.probe_cluster_configs.insert(update.probe_cluster_configs.end(),
probes.begin(), probes.end());
time_since_last_received_packet_ =
!last_packet_received_time_.IsMinusInfinity() &&
use_downlink_delay_for_congestion_window_
? msg.at_time - last_packet_received_time_
: TimeDelta::Zero();
if (rate_control_settings_.UseCongestionWindow() &&
(time_since_last_received_packet_ > TimeDelta::Zero())) {
UpdateCongestionWindowSize();
use_downlink_delay_for_congestion_window_ &&
last_packet_received_time_.IsFinite() && !feedback_max_rtts_.empty()) {
UpdateCongestionWindowSize(msg.at_time - last_packet_received_time_);
}
MaybeTriggerOnNetworkChanged(&update, msg.at_time);
return update;
@ -405,18 +401,21 @@ NetworkControlUpdate GoogCcNetworkController::OnTransportLossReport(
return NetworkControlUpdate();
}
void GoogCcNetworkController::UpdateCongestionWindowSize() {
if (feedback_max_rtts_.empty())
return;
int64_t min_feedback_max_rtt_ms =
*std::min_element(feedback_max_rtts_.begin(), feedback_max_rtts_.end());
void GoogCcNetworkController::UpdateCongestionWindowSize(
TimeDelta time_since_last_packet) {
TimeDelta min_feedback_max_rtt = TimeDelta::ms(
*std::min_element(feedback_max_rtts_.begin(), feedback_max_rtts_.end()));
const DataSize kMinCwnd = DataSize::bytes(2 * 1500);
TimeDelta time_window =
min_feedback_max_rtt +
TimeDelta::ms(
min_feedback_max_rtt_ms +
rate_control_settings_.GetCongestionWindowAdditionalTimeMs()) +
time_since_last_received_packet_;
rate_control_settings_.GetCongestionWindowAdditionalTimeMs());
if (use_downlink_delay_for_congestion_window_) {
time_window += time_since_last_packet;
}
DataSize data_window = last_raw_target_rate_ * time_window;
if (current_data_window_) {
data_window =
@ -577,7 +576,7 @@ NetworkControlUpdate GoogCcNetworkController::OnTransportPacketsFeedback(
// we don't try to limit the outstanding packets.
if (rate_control_settings_.UseCongestionWindow() &&
max_feedback_rtt.IsFinite()) {
UpdateCongestionWindowSize();
UpdateCongestionWindowSize(/*time_since_last_packet*/ TimeDelta::Zero());
}
if (congestion_window_pushback_controller_ && current_data_window_) {
congestion_window_pushback_controller_->SetDataWindow(

3
modules/congestion_controller/goog_cc/goog_cc_network_control.h
View File

@ -74,7 +74,7 @@ class GoogCcNetworkController : public NetworkControllerInterface {
void ClampConstraints();
void MaybeTriggerOnNetworkChanged(NetworkControlUpdate* update,
Timestamp at_time);
void UpdateCongestionWindowSize();
void UpdateCongestionWindowSize(TimeDelta time_since_last_packet);
PacerConfig GetPacingRates(Timestamp at_time) const;
const FieldTrialBasedConfig trial_based_config_;
@ -123,7 +123,6 @@ class GoogCcNetworkController : public NetworkControllerInterface {
uint8_t last_estimated_fraction_loss_ = 0;
int64_t last_estimated_rtt_ms_ = 0;
Timestamp last_packet_received_time_ = Timestamp::MinusInfinity();
TimeDelta time_since_last_received_packet_ = TimeDelta::Zero();
double pacing_factor_;
DataRate min_total_allocated_bitrate_;