admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix division by 0 in loss_based_bwe_v2.

Browse Source 
Bug: webrtc:12707
Change-Id: I16a643235aa2e51f0a062734482000562c8f6b4d
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/257080
Reviewed-by: Per Kjellander <perkj@webrtc.org>
Commit-Queue: Diep Bui <diepbp@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#36374}
This commit is contained in:
Diep Bui 2022-03-29 15:26:33 +00:00 committed by WebRTC LUCI CQ
parent e6aabd0ef0
commit 952dc0ce84
2 changed files with 38 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/congestion_controller/goog_cc/loss_based_bwe_v2.cc
View File

@ -838,9 +838,10 @@ bool LossBasedBweV2::PushBackObservation(
last_send_time - last_send_time_most_recent_observation_;
// Too small to be meaningful.
if (observation_duration < config_->observation_duration_lower_bound &&
(delay_detector_state == BandwidthUsage::kBwNormal ||
!config_->trendline_integration_enabled)) {
if (observation_duration <= TimeDelta::Zero() ||
(observation_duration < config_->observation_duration_lower_bound &&
(delay_detector_state == BandwidthUsage::kBwNormal ||
!config_->trendline_integration_enabled))) {
return false;
}

34
modules/congestion_controller/goog_cc/loss_based_bwe_v2_test.cc
View File

@ -581,5 +581,39 @@ TEST(LossBasedBweV2Test, NotUseAckedBitrateInNormalState) {
acked_bitrate);
}
TEST(LossBasedBweV2Test, NoUpdateIfObservationDurationUnchanged) {
PacketResult enough_feedback_1[2];
enough_feedback_1[0].sent_packet.size = DataSize::Bytes(15'000);
enough_feedback_1[1].sent_packet.size = DataSize::Bytes(15'000);
enough_feedback_1[0].sent_packet.send_time = Timestamp::Zero();
enough_feedback_1[1].sent_packet.send_time =
Timestamp::Zero() + kObservationDurationLowerBound;
enough_feedback_1[0].receive_time =
Timestamp::Zero() + kObservationDurationLowerBound;
enough_feedback_1[1].receive_time =
Timestamp::Zero() + 2 * kObservationDurationLowerBound;
ExplicitKeyValueConfig key_value_config(
Config(/*enabled=*/true, /*valid=*/true));
LossBasedBweV2 loss_based_bandwidth_estimator(&key_value_config);
loss_based_bandwidth_estimator.SetBandwidthEstimate(
DataRate::KilobitsPerSec(600));
DataRate acked_bitrate = DataRate::KilobitsPerSec(300);
loss_based_bandwidth_estimator.SetAcknowledgedBitrate(acked_bitrate);
loss_based_bandwidth_estimator.UpdateBandwidthEstimate(
enough_feedback_1, DataRate::PlusInfinity(), BandwidthUsage::kBwNormal);
DataRate current_estimate =
loss_based_bandwidth_estimator.GetBandwidthEstimate(
/*delay_based_limit=*/DataRate::PlusInfinity());
// Use the same feedback and check if the estimate is unchanged.
loss_based_bandwidth_estimator.UpdateBandwidthEstimate(
enough_feedback_1, DataRate::PlusInfinity(), BandwidthUsage::kBwNormal);
DataRate new_estimate = loss_based_bandwidth_estimator.GetBandwidthEstimate(
/*delay_based_limit=*/DataRate::PlusInfinity());
EXPECT_EQ(current_estimate, new_estimate);
}
} // namespace
} // namespace webrtc