Support REMB in combination with send-side BWE.
BUG=webrtc:4173
Review URL: https://codereview.webrtc.org/1581113006
Cr-Commit-Position: refs/heads/master@{#11322}
diff --git a/webrtc/modules/bitrate_controller/bitrate_controller_impl.cc b/webrtc/modules/bitrate_controller/bitrate_controller_impl.cc
index f8fd2bb..da51c6f 100644
--- a/webrtc/modules/bitrate_controller/bitrate_controller_impl.cc
+++ b/webrtc/modules/bitrate_controller/bitrate_controller_impl.cc
@@ -143,6 +143,15 @@
MaybeTriggerOnNetworkChanged();
}
+void BitrateControllerImpl::UpdateDelayBasedEstimate(uint32_t bitrate_bps) {
+ {
+ rtc::CritScope cs(&critsect_);
+ bandwidth_estimation_.UpdateDelayBasedEstimate(clock_->TimeInMilliseconds(),
+ bitrate_bps);
+ }
+ MaybeTriggerOnNetworkChanged();
+}
+
int64_t BitrateControllerImpl::TimeUntilNextProcess() {
const int64_t kBitrateControllerUpdateIntervalMs = 25;
rtc::CritScope cs(&critsect_);
diff --git a/webrtc/modules/bitrate_controller/bitrate_controller_impl.h b/webrtc/modules/bitrate_controller/bitrate_controller_impl.h
index b601899..d7888cc 100644
--- a/webrtc/modules/bitrate_controller/bitrate_controller_impl.h
+++ b/webrtc/modules/bitrate_controller/bitrate_controller_impl.h
@@ -36,8 +36,9 @@
RtcpBandwidthObserver* CreateRtcpBandwidthObserver() override;
void SetStartBitrate(int start_bitrate_bps) override;
- void SetMinMaxBitrate(int min_bitrate_bps,
- int max_bitrate_bps) override;
+ void SetMinMaxBitrate(int min_bitrate_bps, int max_bitrate_bps) override;
+
+ void UpdateDelayBasedEstimate(uint32_t bitrate_bps) override;
void SetReservedBitrate(uint32_t reserved_bitrate_bps) override;
diff --git a/webrtc/modules/bitrate_controller/bitrate_controller_unittest.cc b/webrtc/modules/bitrate_controller/bitrate_controller_unittest.cc
index 2b9e589..fd9636a 100644
--- a/webrtc/modules/bitrate_controller/bitrate_controller_unittest.cc
+++ b/webrtc/modules/bitrate_controller/bitrate_controller_unittest.cc
@@ -162,14 +162,18 @@
bandwidth_observer_->OnReceivedRtcpReceiverReport(report_blocks, 50, time_ms);
EXPECT_EQ(300000, bitrate_observer_.last_bitrate_);
- // Test that a low REMB trigger immediately.
+ // Test that a low delay-based estimate limits the combined estimate.
+ controller_->UpdateDelayBasedEstimate(280000);
+ EXPECT_EQ(280000, bitrate_observer_.last_bitrate_);
+
+ // Test that a low REMB limits the combined estimate.
bandwidth_observer_->OnReceivedEstimatedBitrate(250000);
EXPECT_EQ(250000, bitrate_observer_.last_bitrate_);
EXPECT_EQ(0, bitrate_observer_.last_fraction_loss_);
EXPECT_EQ(50, bitrate_observer_.last_rtt_);
bandwidth_observer_->OnReceivedEstimatedBitrate(1000);
- EXPECT_EQ(100000, bitrate_observer_.last_bitrate_); // Min cap.
+ EXPECT_EQ(100000, bitrate_observer_.last_bitrate_);
}
TEST_F(BitrateControllerTest, OneBitrateObserverTwoRtcpObservers) {
diff --git a/webrtc/modules/bitrate_controller/include/bitrate_controller.h b/webrtc/modules/bitrate_controller/include/bitrate_controller.h
index d1eca8e..a9c247a 100644
--- a/webrtc/modules/bitrate_controller/include/bitrate_controller.h
+++ b/webrtc/modules/bitrate_controller/include/bitrate_controller.h
@@ -57,6 +57,8 @@
virtual void SetStartBitrate(int start_bitrate_bps) = 0;
virtual void SetMinMaxBitrate(int min_bitrate_bps, int max_bitrate_bps) = 0;
+ virtual void UpdateDelayBasedEstimate(uint32_t bitrate_bps) = 0;
+
virtual void SetEventLog(RtcEventLog* event_log) = 0;
// Gets the available payload bandwidth in bits per second. Note that
diff --git a/webrtc/modules/bitrate_controller/include/mock/mock_bitrate_controller.h b/webrtc/modules/bitrate_controller/include/mock/mock_bitrate_controller.h
index 7a7d2e4..8748696 100644
--- a/webrtc/modules/bitrate_controller/include/mock/mock_bitrate_controller.h
+++ b/webrtc/modules/bitrate_controller/include/mock/mock_bitrate_controller.h
@@ -24,6 +24,21 @@
uint8_t fraction_loss,
int64_t rtt_ms));
};
+
+class MockBitrateController : public BitrateController {
+ public:
+ MOCK_METHOD0(CreateRtcpBandwidthObserver, RtcpBandwidthObserver*());
+ MOCK_METHOD1(SetStartBitrate, void(int start_bitrate_bps));
+ MOCK_METHOD2(SetMinMaxBitrate,
+ void(int min_bitrate_bps, int max_bitrate_bps));
+ MOCK_METHOD1(UpdateDelayBasedEstimate, void(uint32_t bitrate_bps));
+ MOCK_METHOD1(SetEventLog, void(RtcEventLog* event_log));
+ MOCK_CONST_METHOD1(AvailableBandwidth, bool(uint32_t* bandwidth));
+ MOCK_METHOD1(SetReservedBitrate, void(uint32_t reserved_bitrate_bps));
+
+ MOCK_METHOD0(Process, int());
+ MOCK_METHOD0(TimeUntilNextProcess, int64_t());
+};
} // namespace test
} // namespace webrtc
diff --git a/webrtc/modules/bitrate_controller/send_side_bandwidth_estimation.cc b/webrtc/modules/bitrate_controller/send_side_bandwidth_estimation.cc
index 258c4d9..6891290 100644
--- a/webrtc/modules/bitrate_controller/send_side_bandwidth_estimation.cc
+++ b/webrtc/modules/bitrate_controller/send_side_bandwidth_estimation.cc
@@ -55,6 +55,7 @@
last_fraction_loss_(0),
last_round_trip_time_ms_(0),
bwe_incoming_(0),
+ delay_based_bitrate_bps_(0),
time_last_decrease_ms_(0),
first_report_time_ms_(-1),
initially_lost_packets_(0),
@@ -104,6 +105,13 @@
bitrate_ = CapBitrateToThresholds(now_ms, bitrate_);
}
+void SendSideBandwidthEstimation::UpdateDelayBasedEstimate(
+ int64_t now_ms,
+ uint32_t bitrate_bps) {
+ delay_based_bitrate_bps_ = bitrate_bps;
+ bitrate_ = CapBitrateToThresholds(now_ms, bitrate_);
+}
+
void SendSideBandwidthEstimation::UpdateReceiverBlock(uint8_t fraction_loss,
int64_t rtt,
int number_of_packets,
@@ -268,6 +276,9 @@
if (bwe_incoming_ > 0 && bitrate > bwe_incoming_) {
bitrate = bwe_incoming_;
}
+ if (delay_based_bitrate_bps_ > 0 && bitrate > delay_based_bitrate_bps_) {
+ bitrate = delay_based_bitrate_bps_;
+ }
if (bitrate > max_bitrate_configured_) {
bitrate = max_bitrate_configured_;
}
diff --git a/webrtc/modules/bitrate_controller/send_side_bandwidth_estimation.h b/webrtc/modules/bitrate_controller/send_side_bandwidth_estimation.h
index 7ffb42c..608a5e7 100644
--- a/webrtc/modules/bitrate_controller/send_side_bandwidth_estimation.h
+++ b/webrtc/modules/bitrate_controller/send_side_bandwidth_estimation.h
@@ -35,6 +35,9 @@
// Call when we receive a RTCP message with TMMBR or REMB.
void UpdateReceiverEstimate(int64_t now_ms, uint32_t bandwidth);
+ // Call when a new delay-based estimate is available.
+ void UpdateDelayBasedEstimate(int64_t now_ms, uint32_t bitrate_bps);
+
// Call when we receive a RTCP message with a ReceiveBlock.
void UpdateReceiverBlock(uint8_t fraction_loss,
int64_t rtt,
@@ -80,6 +83,7 @@
int64_t last_round_trip_time_ms_;
uint32_t bwe_incoming_;
+ uint32_t delay_based_bitrate_bps_;
int64_t time_last_decrease_ms_;
int64_t first_report_time_ms_;
int initially_lost_packets_;