Pass time constant to bwe smoothing filter.

webrtc/voice_engine/channel.cc

 /*
  *  Copyright (c) 2012 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.
  */
 
@@ skipping 1286 matching lines @@
 
   if (_rtpRtcpModule->SetAudioPacketSize(codec.pacsize) != 0) {
     WEBRTC_TRACE(kTraceError, kTraceVoice, VoEId(_instanceId, _channelId),
                  "SetSendCodec() failed to set audio packet size");
     return -1;
   }
 
   return 0;
 }
 
-void Channel::SetBitRate(int bitrate_bps) {
+void Channel::SetBitRate(int bitrate_bps,
+                         rtc::Optional<int64_t> probing_interval_ms) {
   WEBRTC_TRACE(kTraceInfo, kTraceVoice, VoEId(_instanceId, _channelId),
                "Channel::SetBitRate(bitrate_bps=%d)", bitrate_bps);
   audio_coding_->ModifyEncoder([&](std::unique_ptr<AudioEncoder>* encoder) {
     if (*encoder)
       (*encoder)->OnReceivedTargetAudioBitrate(bitrate_bps);
   });
   retransmission_rate_limiter_->SetMaxRate(bitrate_bps);
 
   // We give smoothed bitrate allocation to audio network adaptor as
   // the uplink bandwidth.
-  // TODO(michaelt) : Remove kDefaultBitrateSmoothingTimeConstantMs as soon as
-  // we pass the probing interval to this function.
-  constexpr int64_t kDefaultBitrateSmoothingTimeConstantMs = 20000;
-  bitrate_smoother_.SetTimeConstantMs(kDefaultBitrateSmoothingTimeConstantMs);
-  bitrate_smoother_.AddSample(bitrate_bps);
-  audio_coding_->ModifyEncoder([&](std::unique_ptr<AudioEncoder>* encoder) {
-    if (*encoder) {
-      (*encoder)->OnReceivedUplinkBandwidth(
-          static_cast<int>(*bitrate_smoother_.GetAverage()));
-    }
-  });
+  // The probing spikes should not affect the bitrate smoother more than 25%.
+  // To simplify the calculations we use a step response as input signal.
+  // The calculation show a step response for an
+  // exponential filter (bitrate_smoother use an exponential filter) with the
+  // length of probing_interval and an amplitude of 1.
+  // 0.22 = 1 - e^(-t/probing_interval * 4) | t = probing_interval.
+  if (probing_interval_ms) {
+    bitrate_smoother_.SetTimeConstantMs(*probing_interval_ms * 4);
+    bitrate_smoother_.AddSample(bitrate_bps);
+    audio_coding_->ModifyEncoder([&](std::unique_ptr<AudioEncoder>* encoder) {
+      if (*encoder) {
+        (*encoder)->OnReceivedUplinkBandwidth(
+            static_cast<int>(*bitrate_smoother_.GetAverage()));
+      }
+    });
+  }
 }
 
 void Channel::OnIncomingFractionLoss(int fraction_lost) {
   audio_coding_->ModifyEncoder([&](std::unique_ptr<AudioEncoder>* encoder) {
     if (*encoder)
       (*encoder)->OnReceivedUplinkPacketLossFraction(fraction_lost / 255.0f);
   });
 }
 
 int32_t Channel::SetVADStatus(bool enableVAD,
@@ skipping 1917 matching lines @@
   int64_t min_rtt = 0;
   if (_rtpRtcpModule->RTT(remoteSSRC, &rtt, &avg_rtt, &min_rtt, &max_rtt) !=
       0) {
     return 0;
   }
   return rtt;
 }
 
 }  // namespace voe
 }  // namespace webrtc