From 5cb19827e77f57b70b8778f167c2820e9a30d38b Mon Sep 17 00:00:00 2001 From: stefan Date: Fri, 16 Jun 2017 07:47:00 -0700 Subject: [PATCH] Tune loss-based BWE to be more compatible with the low frequency loss reports of audio streams. BUG=webrtc:5079 Review-Url: https://codereview.webrtc.org/2941253002 Cr-Commit-Position: refs/heads/master@{#18634} --- .../bitrate_controller_unittest.cc | 12 ++++++------ .../send_side_bandwidth_estimation.cc | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/webrtc/modules/bitrate_controller/bitrate_controller_unittest.cc b/webrtc/modules/bitrate_controller/bitrate_controller_unittest.cc index fb54deedc0..a01299861b 100644 --- a/webrtc/modules/bitrate_controller/bitrate_controller_unittest.cc +++ b/webrtc/modules/bitrate_controller/bitrate_controller_unittest.cc @@ -433,20 +433,20 @@ TEST_F(BitrateControllerTest, TimeoutsWithoutFeedback) { report_blocks, 50, clock_.TimeInMilliseconds()); expected_bitrate_bps = expected_bitrate_bps * 1.08 + 1000; EXPECT_EQ(expected_bitrate_bps, bitrate_observer_.last_bitrate_); - clock_.AdvanceTimeMilliseconds(1000); + clock_.AdvanceTimeMilliseconds(4000); - // 1 seconds since feedback, expect increase. + // 4 seconds since feedback, expect increase. controller_->Process(); expected_bitrate_bps = expected_bitrate_bps * 1.08 + 1000; EXPECT_EQ(expected_bitrate_bps, bitrate_observer_.last_bitrate_); - clock_.AdvanceTimeMilliseconds(800); + clock_.AdvanceTimeMilliseconds(2000); - // 1.8 seconds since feedback, expect no increase. + // 6 seconds since feedback, expect no increase. controller_->Process(); EXPECT_EQ(expected_bitrate_bps, bitrate_observer_.last_bitrate_); - clock_.AdvanceTimeMilliseconds(3701); + clock_.AdvanceTimeMilliseconds(9001); - // More than 4.5 seconds since feedback, expect decrease. + // More than 15 seconds since feedback, expect decrease. controller_->Process(); expected_bitrate_bps *= 0.8; EXPECT_EQ(expected_bitrate_bps, bitrate_observer_.last_bitrate_); diff --git a/webrtc/modules/bitrate_controller/send_side_bandwidth_estimation.cc b/webrtc/modules/bitrate_controller/send_side_bandwidth_estimation.cc index e7bb6361f2..dc14905890 100644 --- a/webrtc/modules/bitrate_controller/send_side_bandwidth_estimation.cc +++ b/webrtc/modules/bitrate_controller/send_side_bandwidth_estimation.cc @@ -33,7 +33,7 @@ const int kDefaultMaxBitrateBps = 1000000000; const int64_t kLowBitrateLogPeriodMs = 10000; const int64_t kRtcEventLogPeriodMs = 5000; // Expecting that RTCP feedback is sent uniformly within [0.5, 1.5]s intervals. -const int64_t kFeedbackIntervalMs = 1500; +const int64_t kFeedbackIntervalMs = 5000; const int64_t kFeedbackTimeoutIntervals = 3; const int64_t kTimeoutIntervalMs = 1000;