commit 1112b2bc68e6c900f56fad79fa7dc1c1796ce9e9
author stefan <stefan@webrtc.org> Thu Apr 14 08:08:15 2016 -0700
committer Commit bot <commit-bot@chromium.org> Thu Apr 14 15:08:20 2016 +0000
tree 7646829c193816e514a80f84c1811ad4a1af9ef6
parent 00b62b0849dd009498d0305ee77d4df70fe5e96b

Fix bug when the BWE times out due to no incoming packets.

Both InterArrival and OveruseEstimator should be timed out at the same time since otherwise the overuse filter may take a long time to converge.

BUG=webrtc:5773

Review URL: https://codereview.webrtc.org/1886783002

Cr-Commit-Position: refs/heads/master@{#12364}

webrtc/modules/congestion_controller/congestion_controller.cc

diff --git a/webrtc/modules/congestion_controller/congestion_controller.cc b/webrtc/modules/congestion_controller/congestion_controller.cc
index 11ce46a..caf39f0 100644
--- a/webrtc/modules/congestion_controller/congestion_controller.cc
+++ b/webrtc/modules/congestion_controller/congestion_controller.cc
@@ -115,7 +115,7 @@
   // Instantiate RBE for Time Offset or Absolute Send Time extensions.
   void PickEstimator() EXCLUSIVE_LOCKS_REQUIRED(crit_sect_.get()) {
     if (using_absolute_send_time_) {
-      rbe_.reset(new RemoteBitrateEstimatorAbsSendTime(observer_, clock_));
+      rbe_.reset(new RemoteBitrateEstimatorAbsSendTime(observer_));
     } else {
       rbe_.reset(new RemoteBitrateEstimatorSingleStream(observer_, clock_));
     }
@@ -156,8 +156,7 @@
       transport_feedback_adapter_(bitrate_controller_.get(), clock_),
       min_bitrate_bps_(RemoteBitrateEstimator::kDefaultMinBitrateBps) {
   transport_feedback_adapter_.SetBitrateEstimator(
-      new RemoteBitrateEstimatorAbsSendTime(&transport_feedback_adapter_,
-                                            clock_));
+      new RemoteBitrateEstimatorAbsSendTime(&transport_feedback_adapter_));
   transport_feedback_adapter_.GetBitrateEstimator()->SetMinBitrate(
       min_bitrate_bps_);
 }