Add interval estimator to remote bitrate estimator

webrtc/modules/remote_bitrate_estimator/aimd_rate_control.cc

Index: webrtc/modules/remote_bitrate_estimator/aimd_rate_control.cc
diff --git a/webrtc/modules/remote_bitrate_estimator/aimd_rate_control.cc b/webrtc/modules/remote_bitrate_estimator/aimd_rate_control.cc
index f83cddc617862b56ca50131895e97921084178b2..e90bb30eba51f0aa5ae41517e8193300e40eb83f 100644
--- a/webrtc/modules/remote_bitrate_estimator/aimd_rate_control.cc
+++ b/webrtc/modules/remote_bitrate_estimator/aimd_rate_control.cc
@@ -130,6 +130,22 @@ void AimdRateControl::SetEstimate(int bitrate_bps, int64_t now_ms) {
   current_bitrate_bps_ = ChangeBitrate(bitrate_bps, bitrate_bps, now_ms);
 }
 
+int AimdRateControl::GetNearMaxIncreaseRateBps() const {
+  double bits_per_frame = static_cast<double>(current_bitrate_bps_) / 30.0;
+  double packets_per_frame = std::ceil(bits_per_frame / (8.0 * 1200.0));
+  double avg_packet_size_bits = bits_per_frame / packets_per_frame;

[minyue-webrtc, 2016/11/14 16:50:42]

possible division of zero?

[michaelt, 2016/11/15 09:41:59]

Theoretical yes. Added a DCHECK of current_bitrate_bps_

+  // Approximate the over-use estimator delay to 100 ms.
+  const int64_t response_time = in_experiment_ ? (rtt_ + 100) * 2 : rtt_ + 100;
+
+  constexpr double kMinIncreaseRateBps = 4000;
+  return std::max(kMinIncreaseRateBps,
+                  (avg_packet_size_bits * 1000) / response_time);

[minyue-webrtc, 2016/11/14 16:50:42]

Add explicit cast

[michaelt, 2016/11/15 09:41:59]

Done.

+}
+
+rtc::Optional<int> AimdRateControl::GetLastDecrease() const {
+  return last_decrease_;
+}
+
 uint32_t AimdRateControl::ChangeBitrate(uint32_t current_bitrate_bps,
                                         uint32_t incoming_bitrate_bps,
                                         int64_t now_ms) {
@@ -161,12 +177,9 @@ uint32_t AimdRateControl::ChangeBitrate(uint32_t current_bitrate_bps,
         avg_max_bitrate_kbps_ = -1.0;
       }
       if (rate_control_region_ == kRcNearMax) {
-        // Approximate the over-use estimator delay to 100 ms.
-        const int64_t response_time = rtt_ + 100;
-        uint32_t additive_increase_bps = AdditiveRateIncrease(
-            now_ms, time_last_bitrate_change_, response_time);
+        uint32_t additive_increase_bps =
+            AdditiveRateIncrease(now_ms, time_last_bitrate_change_);
         current_bitrate_bps += additive_increase_bps;
-
       } else {
         uint32_t multiplicative_increase_bps = MultiplicativeRateIncrease(
             now_ms, time_last_bitrate_change_, current_bitrate_bps);
@@ -196,6 +209,10 @@ uint32_t AimdRateControl::ChangeBitrate(uint32_t current_bitrate_bps,
         }
         ChangeRegion(kRcNearMax);
 
+        if (incoming_bitrate_bps < current_bitrate_bps_) {
+          last_decrease_ =
+              rtc::Optional<int>(current_bitrate_bps_ - current_bitrate_bps);
+        }
         if (incoming_bitrate_kbps < avg_max_bitrate_kbps_ -
             3 * std_max_bit_rate) {
           avg_max_bitrate_kbps_ = -1.0f;
@@ -234,22 +251,9 @@ uint32_t AimdRateControl::MultiplicativeRateIncrease(
   return multiplicative_increase_bps;
 }
 
-uint32_t AimdRateControl::AdditiveRateIncrease(
-    int64_t now_ms, int64_t last_ms, int64_t response_time_ms) const {
-  assert(response_time_ms > 0);
-  double beta = 0.0;
-  if (last_ms > 0) {
-    beta = std::min((now_ms - last_ms) / static_cast<double>(response_time_ms),
-                    1.0);
-    if (in_experiment_)
-      beta /= 2.0;
-  }
-  double bits_per_frame = static_cast<double>(current_bitrate_bps_) / 30.0;
-  double packets_per_frame = std::ceil(bits_per_frame / (8.0 * 1200.0));
-  double avg_packet_size_bits = bits_per_frame / packets_per_frame;
-  uint32_t additive_increase_bps = std::max(
-      1000.0, beta * avg_packet_size_bits);
-  return additive_increase_bps;
+uint32_t AimdRateControl::AdditiveRateIncrease(int64_t now_ms,
+                                               int64_t last_ms) const {
+  return (now_ms - last_ms) * GetNearMaxIncreaseRateBps() / 1000.0;

[minyue-webrtc, 2016/11/14 16:50:42]

why double on 1000.0 or do we want to return a double (or float)?

[michaelt, 2016/11/15 09:41:59]

Removed ".0" from 1000

 }
 
 void AimdRateControl::UpdateMaxBitRateEstimate(float incoming_bitrate_kbps) {