From 4bd3177ae5dc613bc1ab0012ed8c07d8efa0e9df Mon Sep 17 00:00:00 2001 From: Christoffer Rodbro Date: Wed, 27 Mar 2019 12:34:21 +0100 Subject: [PATCH] Reland "Avoid calling OnRoundTripTimeUpdate with invalid RTTs." This is a reland of afa61c94e50e2737d4d4b22d7a830845e763cf27 Original change's description: > Avoid calling OnRoundTripTimeUpdate with invalid RTTs. > > Bug: none > Change-Id: Ic19b87ad7094465da6091d0e99b10a6d1b7d2e58 > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/128776 > Commit-Queue: Christoffer Rodbro > Reviewed-by: Sebastian Jansson > Cr-Commit-Position: refs/heads/master@{#27308} Bug: none Change-Id: Ic5669a27ea66ab0c207556c54bb595c83850ffd3 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/129924 Reviewed-by: Sebastian Jansson Commit-Queue: Christoffer Rodbro Cr-Commit-Position: refs/heads/master@{#27315} --- call/rtp_transport_controller_send.cc | 2 +- .../congestion_controller/goog_cc/goog_cc_network_control.cc | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/call/rtp_transport_controller_send.cc b/call/rtp_transport_controller_send.cc index a414c3b425..ab95907ac8 100644 --- a/call/rtp_transport_controller_send.cc +++ b/call/rtp_transport_controller_send.cc @@ -400,7 +400,7 @@ void RtpTransportControllerSend::OnReceivedRtcpReceiverReport( report.receive_time = Timestamp::ms(now_ms); report.round_trip_time = TimeDelta::ms(rtt_ms); report.smoothed = false; - if (controller_) + if (controller_ && !report.round_trip_time.IsZero()) PostUpdates(controller_->OnRoundTripTimeUpdate(report)); }); } diff --git a/modules/congestion_controller/goog_cc/goog_cc_network_control.cc b/modules/congestion_controller/goog_cc/goog_cc_network_control.cc index 283ca983e9..e39d43f615 100644 --- a/modules/congestion_controller/goog_cc/goog_cc_network_control.cc +++ b/modules/congestion_controller/goog_cc/goog_cc_network_control.cc @@ -229,6 +229,7 @@ NetworkControlUpdate GoogCcNetworkController::OnRoundTripTimeUpdate( RoundTripTimeUpdate msg) { if (packet_feedback_only_ || msg.smoothed) return NetworkControlUpdate(); + RTC_DCHECK(!msg.round_trip_time.IsZero()); if (delay_based_bwe_) delay_based_bwe_->OnRttUpdate(msg.round_trip_time); bandwidth_estimation_->UpdateRtt(msg.round_trip_time, msg.receive_time);