Fix issue where the first audio packets significantly impacts initial BWE negatively.

webrtc/modules/remote_bitrate_estimator/aimd_rate_control.cc

 /*
  *  Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #include "webrtc/modules/remote_bitrate_estimator/aimd_rate_control.h"
 
 #include <algorithm>
 #include <cassert>
 #include <cmath>
 
+#include "webrtc/base/checks.h"
 #include "webrtc/modules/remote_bitrate_estimator/overuse_detector.h"
 #include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.h"
 
 namespace webrtc {
 
 static const int64_t kDefaultRttMs = 200;
 static const int64_t kLogIntervalMs = 1000;
 static const double kWithinIncomingBitrateHysteresis = 1.05;
 static const int64_t kMaxFeedbackIntervalMs = 1000;
 
@@ skipping 68 matching lines @@
 void AimdRateControl::SetRtt(int64_t rtt) {
   rtt_ = rtt;
 }
 
 void AimdRateControl::Update(const RateControlInput* input, int64_t now_ms) {
   assert(input);
 
   // Set the initial bit rate value to what we're receiving the first half
   // second.
   if (!bitrate_is_initialized_) {
+    const int64_t kInitializationTimeMs = 5000;
+    DCHECK_LE(kBitrateWindowMs, kInitializationTimeMs);
     if (time_first_incoming_estimate_ < 0) {
       if (input->_incomingBitRate > 0) {
         time_first_incoming_estimate_ = now_ms;
       }
-    } else if (now_ms - time_first_incoming_estimate_ > 500 &&
+    } else if (now_ms - time_first_incoming_estimate_ > kInitializationTimeMs &&
                input->_incomingBitRate > 0) {
       current_bitrate_bps_ = input->_incomingBitRate;
       bitrate_is_initialized_ = true;
     }
   }
 
   if (updated_ && current_input_._bwState == kBwOverusing) {
     // Only update delay factor and incoming bit rate. We always want to react
     // on an over-use.
     current_input_._noiseVar = input->_noiseVar;
     current_input_._incomingBitRate = input->_incomingBitRate;
   } else {
     updated_ = true;
     current_input_ = *input;
   }
 }
 
 void AimdRateControl::SetEstimate(int bitrate_bps, int64_t now_ms) {
   updated_ = true;
   bitrate_is_initialized_ = true;
   current_bitrate_bps_ = ChangeBitrate(bitrate_bps, bitrate_bps, now_ms);
 }
 
 uint32_t AimdRateControl::ChangeBitrate(uint32_t current_bitrate_bps,
                                         uint32_t incoming_bitrate_bps,
                                         int64_t now_ms) {
   if (!updated_) {
     return current_bitrate_bps_;
   }
+  // An over-use should always trigger us to reduce the bitrate, even though
+  // we have not yet established our first estimate. By acting on the over-use,
+  // we will end up with a valid estimate.
+  if (!bitrate_is_initialized_ && current_input_._bwState != kBwOverusing)
+    return current_bitrate_bps_;
   updated_ = false;
   ChangeState(current_input_, now_ms);
   // Calculated here because it's used in multiple places.
   const float incoming_bitrate_kbps = incoming_bitrate_bps / 1000.0f;
   // Calculate the max bit rate std dev given the normalized
   // variance and the current incoming bit rate.
   const float std_max_bit_rate = sqrt(var_max_bitrate_kbps_ *
                                       avg_max_bitrate_kbps_);
   switch (rate_control_state_) {
     case kRcHold:
@@ skipping 16 matching lines @@
       } else {
         uint32_t multiplicative_increase_bps = MultiplicativeRateIncrease(
             now_ms, time_last_bitrate_change_, current_bitrate_bps);
         current_bitrate_bps += multiplicative_increase_bps;
       }
 
       time_last_bitrate_change_ = now_ms;
       break;
 
     case kRcDecrease:
+      bitrate_is_initialized_ = true;
       if (incoming_bitrate_bps < min_configured_bitrate_bps_) {
         current_bitrate_bps = min_configured_bitrate_bps_;
       } else {
         // Set bit rate to something slightly lower than max
         // to get rid of any self-induced delay.
         current_bitrate_bps = static_cast<uint32_t>(beta_ *
                                                     incoming_bitrate_bps + 0.5);
         if (current_bitrate_bps > current_bitrate_bps_) {
           // Avoid increasing the rate when over-using.
           if (rate_control_region_ != kRcMaxUnknown) {
@@ skipping 108 matching lines @@
 }
 
 void AimdRateControl::ChangeRegion(RateControlRegion region) {
   rate_control_region_ = region;
 }
 
 void AimdRateControl::ChangeState(RateControlState new_state) {
   rate_control_state_ = new_state;
 }
 }  // namespace webrtc