Revert of Pass time constant to bwe smoothing filter.

webrtc/call/bitrate_allocator_unittest.cc

Index: webrtc/call/bitrate_allocator_unittest.cc
diff --git a/webrtc/call/bitrate_allocator_unittest.cc b/webrtc/call/bitrate_allocator_unittest.cc
index 751ec93657d54c815c3b268744a46773c968bf3f..5d0395d82cae9d2dfe94140e547c9c7f729ea8b3 100644
--- a/webrtc/call/bitrate_allocator_unittest.cc
+++ b/webrtc/call/bitrate_allocator_unittest.cc
@@ -34,7 +34,6 @@
       : last_bitrate_bps_(0),
         last_fraction_loss_(0),
         last_rtt_ms_(0),
-        last_probing_interval_ms_(0),
         protection_ratio_(0.0) {}
 
   void SetBitrateProtectionRatio(double protection_ratio) {
@@ -43,29 +42,22 @@
 
   uint32_t OnBitrateUpdated(uint32_t bitrate_bps,
                             uint8_t fraction_loss,
-                            int64_t rtt,
-                            int64_t probing_interval_ms) override {
+                            int64_t rtt) override {
     last_bitrate_bps_ = bitrate_bps;
     last_fraction_loss_ = fraction_loss;
     last_rtt_ms_ = rtt;
-    last_probing_interval_ms_ = probing_interval_ms;
     return bitrate_bps * protection_ratio_;
   }
   uint32_t last_bitrate_bps_;
   uint8_t last_fraction_loss_;
   int64_t last_rtt_ms_;
-  int last_probing_interval_ms_;
   double protection_ratio_;
 };
-
-namespace {
-constexpr int64_t kDefaultProbingIntervalMs = 3000;
-}
 
 class BitrateAllocatorTest : public ::testing::Test {
  protected:
   BitrateAllocatorTest() : allocator_(new BitrateAllocator(&limit_observer_)) {
-    allocator_->OnNetworkChanged(300000u, 0, 0, kDefaultProbingIntervalMs);
+    allocator_->OnNetworkChanged(300000u, 0, 0);
   }
   ~BitrateAllocatorTest() {}
 
@@ -83,12 +75,12 @@
   allocator_->AddObserver(&bitrate_observer, kMinSendBitrateBps, 1500000,
                           kPadUpToBitrateBps, true);
   EXPECT_EQ(300000, allocator_->GetStartBitrate(&bitrate_observer));
-  allocator_->OnNetworkChanged(200000, 0, 0, kDefaultProbingIntervalMs);
+  allocator_->OnNetworkChanged(200000, 0, 0);
   EXPECT_EQ(200000, allocator_->GetStartBitrate(&bitrate_observer));
 
   // TODO(pbos): Expect capping to 1.5M instead of 3M when not boosting the max
   // bitrate for FEC/retransmissions (see todo in BitrateAllocator).
-  allocator_->OnNetworkChanged(4000000, 0, 0, kDefaultProbingIntervalMs);
+  allocator_->OnNetworkChanged(4000000, 0, 0);
   EXPECT_EQ(3000000, allocator_->GetStartBitrate(&bitrate_observer));
 
   // Expect |max_padding_bitrate_bps| to change to 0 if the observer is updated.
@@ -104,7 +96,7 @@
                           true);
   EXPECT_EQ(3000000, allocator_->GetStartBitrate(&bitrate_observer));
   EXPECT_EQ(3000000u, bitrate_observer.last_bitrate_bps_);
-  allocator_->OnNetworkChanged(1500000, 0, 0, kDefaultProbingIntervalMs);
+  allocator_->OnNetworkChanged(1500000, 0, 0);
   EXPECT_EQ(1500000u, bitrate_observer.last_bitrate_bps_);
 }
 
@@ -122,7 +114,7 @@
   // Test too low start bitrate, hence lower than sum of min. Min bitrates
   // will
   // be allocated to all observers.
-  allocator_->OnNetworkChanged(200000, 0, 50, kDefaultProbingIntervalMs);
+  allocator_->OnNetworkChanged(200000, 0, 50);
   EXPECT_EQ(100000u, bitrate_observer_1.last_bitrate_bps_);
   EXPECT_EQ(0, bitrate_observer_1.last_fraction_loss_);
   EXPECT_EQ(50, bitrate_observer_1.last_rtt_ms_);
@@ -131,7 +123,7 @@
   EXPECT_EQ(50, bitrate_observer_2.last_rtt_ms_);
 
   // Test a bitrate which should be distributed equally.
-  allocator_->OnNetworkChanged(500000, 0, 50, kDefaultProbingIntervalMs);
+  allocator_->OnNetworkChanged(500000, 0, 50);
   const uint32_t kBitrateToShare = 500000 - 200000 - 100000;
   EXPECT_EQ(100000u + kBitrateToShare / 2,
             bitrate_observer_1.last_bitrate_bps_);
@@ -140,14 +132,14 @@
 
   // Limited by 2x max bitrates since we leave room for FEC and
   // retransmissions.
-  allocator_->OnNetworkChanged(1500000, 0, 50, kDefaultProbingIntervalMs);
+  allocator_->OnNetworkChanged(1500000, 0, 50);
   EXPECT_EQ(600000u, bitrate_observer_1.last_bitrate_bps_);
   EXPECT_EQ(600000u, bitrate_observer_2.last_bitrate_bps_);
 
   // Verify that if the bandwidth estimate is set to zero, the allocated
   // rate is
   // zero.
-  allocator_->OnNetworkChanged(0, 0, 50, kDefaultProbingIntervalMs);
+  allocator_->OnNetworkChanged(0, 0, 50);
   EXPECT_EQ(0u, bitrate_observer_1.last_bitrate_bps_);
   EXPECT_EQ(0u, bitrate_observer_2.last_bitrate_bps_);
 }
@@ -169,7 +161,7 @@
  protected:
   BitrateAllocatorTestNoEnforceMin()
       : allocator_(new BitrateAllocator(&limit_observer_)) {
-    allocator_->OnNetworkChanged(300000u, 0, 0, kDefaultProbingIntervalMs);
+    allocator_->OnNetworkChanged(300000u, 0, 0);
   }
   ~BitrateAllocatorTestNoEnforceMin() {}
 
@@ -188,11 +180,11 @@
   EXPECT_EQ(300000, allocator_->GetStartBitrate(&bitrate_observer_1));
 
   // High BWE.
-  allocator_->OnNetworkChanged(150000, 0, 0, kDefaultProbingIntervalMs);
+  allocator_->OnNetworkChanged(150000, 0, 0);
   EXPECT_EQ(150000u, bitrate_observer_1.last_bitrate_bps_);
 
   // Low BWE.
-  allocator_->OnNetworkChanged(10000, 0, 0, kDefaultProbingIntervalMs);
+  allocator_->OnNetworkChanged(10000, 0, 0);
   EXPECT_EQ(0u, bitrate_observer_1.last_bitrate_bps_);
 
   EXPECT_CALL(limit_observer_, OnAllocationLimitsChanged(0, 0));
@@ -218,7 +210,7 @@
 
   // High BWE. Make sure the controllers get a fair share of the surplus (i.e.,
   // what is left after each controller gets its min rate).
-  allocator_->OnNetworkChanged(690000, 0, 0, kDefaultProbingIntervalMs);
+  allocator_->OnNetworkChanged(690000, 0, 0);
   // Verify that each observer gets its min rate (sum of min rates is 600000),
   // and that the remaining 90000 is divided equally among the three.
   uint32_t bitrate_to_share = 690000u - 100000u - 200000u - 300000u;
@@ -230,27 +222,27 @@
             bitrate_observer_3.last_bitrate_bps_);
 
   // BWE below the sum of observer's min bitrate.
-  allocator_->OnNetworkChanged(300000, 0, 0, kDefaultProbingIntervalMs);
+  allocator_->OnNetworkChanged(300000, 0, 0);
   EXPECT_EQ(100000u, bitrate_observer_1.last_bitrate_bps_);  // Min bitrate.
   EXPECT_EQ(200000u, bitrate_observer_2.last_bitrate_bps_);  // Min bitrate.
   EXPECT_EQ(0u, bitrate_observer_3.last_bitrate_bps_);  // Nothing.
 
   // Increased BWE, but still below the sum of configured min bitrates for all
   // observers and too little for observer 3. 1 and 2 will share the rest.
-  allocator_->OnNetworkChanged(500000, 0, 0, kDefaultProbingIntervalMs);
+  allocator_->OnNetworkChanged(500000, 0, 0);
   EXPECT_EQ(200000u, bitrate_observer_1.last_bitrate_bps_);  // Min + split.
   EXPECT_EQ(300000u, bitrate_observer_2.last_bitrate_bps_);  // Min + split.
   EXPECT_EQ(0u, bitrate_observer_3.last_bitrate_bps_);  // Nothing.
 
   // Below min for all.
-  allocator_->OnNetworkChanged(10000, 0, 0, kDefaultProbingIntervalMs);
+  allocator_->OnNetworkChanged(10000, 0, 0);
   EXPECT_EQ(0u, bitrate_observer_1.last_bitrate_bps_);
   EXPECT_EQ(0u, bitrate_observer_2.last_bitrate_bps_);
   EXPECT_EQ(0u, bitrate_observer_3.last_bitrate_bps_);
 
   // Verify that zero estimated bandwidth, means that that all gets zero,
   // regardless of set min bitrate.
-  allocator_->OnNetworkChanged(0, 0, 0, kDefaultProbingIntervalMs);
+  allocator_->OnNetworkChanged(0, 0, 0);
   EXPECT_EQ(0u, bitrate_observer_1.last_bitrate_bps_);
   EXPECT_EQ(0u, bitrate_observer_2.last_bitrate_bps_);
   EXPECT_EQ(0u, bitrate_observer_3.last_bitrate_bps_);
@@ -270,38 +262,34 @@
   EXPECT_EQ(300000, allocator_->GetStartBitrate(&bitrate_observer));
 
   // High BWE.
-  allocator_->OnNetworkChanged(150000, 0, 0, kDefaultProbingIntervalMs);
+  allocator_->OnNetworkChanged(150000, 0, 0);
   EXPECT_EQ(150000u, bitrate_observer.last_bitrate_bps_);
 
   // Add loss and use a part of the bitrate for protection.
   double protection_ratio = 0.4;
   uint8_t fraction_loss = protection_ratio * 256;
   bitrate_observer.SetBitrateProtectionRatio(protection_ratio);
-  allocator_->OnNetworkChanged(200000, 0, fraction_loss,
-                               kDefaultProbingIntervalMs);
+  allocator_->OnNetworkChanged(200000, 0, fraction_loss);
   EXPECT_EQ(200000u, bitrate_observer.last_bitrate_bps_);
 
   // Above the min threshold, but not enough given the protection used.
-  allocator_->OnNetworkChanged(139000, 0, fraction_loss,
-                               kDefaultProbingIntervalMs);
+  allocator_->OnNetworkChanged(139000, 0, fraction_loss);
   EXPECT_EQ(0u, bitrate_observer.last_bitrate_bps_);
 
   // Verify the hysteresis is added for the protection.
-  allocator_->OnNetworkChanged(150000, 0, fraction_loss,
-                               kDefaultProbingIntervalMs);
+  allocator_->OnNetworkChanged(150000, 0, fraction_loss);
   EXPECT_EQ(0u, bitrate_observer.last_bitrate_bps_);
 
   // Just enough to enable video again.
-  allocator_->OnNetworkChanged(168000, 0, fraction_loss,
-                               kDefaultProbingIntervalMs);
+  allocator_->OnNetworkChanged(168000, 0, fraction_loss);
   EXPECT_EQ(168000u, bitrate_observer.last_bitrate_bps_);
 
   // Remove all protection and make sure video is not paused as earlier.
   bitrate_observer.SetBitrateProtectionRatio(0.0);
-  allocator_->OnNetworkChanged(140000, 0, 0, kDefaultProbingIntervalMs);
+  allocator_->OnNetworkChanged(140000, 0, 0);
   EXPECT_EQ(140000u, bitrate_observer.last_bitrate_bps_);
 
-  allocator_->OnNetworkChanged(139000, 0, 0, kDefaultProbingIntervalMs);
+  allocator_->OnNetworkChanged(139000, 0, 0);
   EXPECT_EQ(139000u, bitrate_observer.last_bitrate_bps_);
 
   EXPECT_CALL(limit_observer_, OnAllocationLimitsChanged(0, 0));
@@ -320,37 +308,37 @@
 
   // Enough bitrate for both.
   bitrate_observer_2.SetBitrateProtectionRatio(0.5);
-  allocator_->OnNetworkChanged(300000, 0, 0, kDefaultProbingIntervalMs);
+  allocator_->OnNetworkChanged(300000, 0, 0);
   EXPECT_EQ(100000u, bitrate_observer_1.last_bitrate_bps_);
   EXPECT_EQ(200000u, bitrate_observer_2.last_bitrate_bps_);
 
   // Above min for observer 2, but too little given the protection used.
-  allocator_->OnNetworkChanged(330000, 0, 0, kDefaultProbingIntervalMs);
+  allocator_->OnNetworkChanged(330000, 0, 0);
   EXPECT_EQ(330000u, bitrate_observer_1.last_bitrate_bps_);
   EXPECT_EQ(0u, bitrate_observer_2.last_bitrate_bps_);
 
-  allocator_->OnNetworkChanged(100000, 0, 0, kDefaultProbingIntervalMs);
-  EXPECT_EQ(100000u, bitrate_observer_1.last_bitrate_bps_);
-  EXPECT_EQ(0u, bitrate_observer_2.last_bitrate_bps_);
-
-  allocator_->OnNetworkChanged(99999, 0, 0, kDefaultProbingIntervalMs);
-  EXPECT_EQ(0u, bitrate_observer_1.last_bitrate_bps_);
-  EXPECT_EQ(0u, bitrate_observer_2.last_bitrate_bps_);
-
-  allocator_->OnNetworkChanged(119000, 0, 0, kDefaultProbingIntervalMs);
-  EXPECT_EQ(0u, bitrate_observer_1.last_bitrate_bps_);
-  EXPECT_EQ(0u, bitrate_observer_2.last_bitrate_bps_);
-
-  allocator_->OnNetworkChanged(120000, 0, 0, kDefaultProbingIntervalMs);
+  allocator_->OnNetworkChanged(100000, 0, 0);
+  EXPECT_EQ(100000u, bitrate_observer_1.last_bitrate_bps_);
+  EXPECT_EQ(0u, bitrate_observer_2.last_bitrate_bps_);
+
+  allocator_->OnNetworkChanged(99999, 0, 0);
+  EXPECT_EQ(0u, bitrate_observer_1.last_bitrate_bps_);
+  EXPECT_EQ(0u, bitrate_observer_2.last_bitrate_bps_);
+
+  allocator_->OnNetworkChanged(119000, 0, 0);
+  EXPECT_EQ(0u, bitrate_observer_1.last_bitrate_bps_);
+  EXPECT_EQ(0u, bitrate_observer_2.last_bitrate_bps_);
+
+  allocator_->OnNetworkChanged(120000, 0, 0);
   EXPECT_EQ(120000u, bitrate_observer_1.last_bitrate_bps_);
   EXPECT_EQ(0u, bitrate_observer_2.last_bitrate_bps_);
 
   // Verify the protection is accounted for before resuming observer 2.
-  allocator_->OnNetworkChanged(429000, 0, 0, kDefaultProbingIntervalMs);
+  allocator_->OnNetworkChanged(429000, 0, 0);
   EXPECT_EQ(400000u, bitrate_observer_1.last_bitrate_bps_);
   EXPECT_EQ(0u, bitrate_observer_2.last_bitrate_bps_);
 
-  allocator_->OnNetworkChanged(430000, 0, 0, kDefaultProbingIntervalMs);
+  allocator_->OnNetworkChanged(430000, 0, 0);
   EXPECT_EQ(100000u, bitrate_observer_1.last_bitrate_bps_);
   EXPECT_EQ(330000u, bitrate_observer_2.last_bitrate_bps_);
 
@@ -377,7 +365,7 @@
 
   // Low BWE. Verify that all observers still get their respective min
   // bitrate.
-  allocator_->OnNetworkChanged(1000, 0, 0, kDefaultProbingIntervalMs);
+  allocator_->OnNetworkChanged(1000, 0, 0);
   EXPECT_EQ(100000u, bitrate_observer_1.last_bitrate_bps_);  // Min cap.
   EXPECT_EQ(200000u, bitrate_observer_2.last_bitrate_bps_);  // Min cap.
   EXPECT_EQ(300000u, bitrate_observer_3.last_bitrate_bps_);  // Min cap.
@@ -395,7 +383,7 @@
   EXPECT_EQ(300000, allocator_->GetStartBitrate(&bitrate_observer_1));
 
   // Set network down, ie, no available bitrate.
-  allocator_->OnNetworkChanged(0, 0, 0, kDefaultProbingIntervalMs);
+  allocator_->OnNetworkChanged(0, 0, 0);
 
   EXPECT_EQ(0u, bitrate_observer_1.last_bitrate_bps_);
 
@@ -411,7 +399,7 @@
   EXPECT_EQ(0u, bitrate_observer_2.last_bitrate_bps_);
 
   // Set network back up.
-  allocator_->OnNetworkChanged(1500000, 0, 50, kDefaultProbingIntervalMs);
+  allocator_->OnNetworkChanged(1500000, 0, 50);
   EXPECT_EQ(750000u, bitrate_observer_1.last_bitrate_bps_);
   EXPECT_EQ(750000u, bitrate_observer_2.last_bitrate_bps_);
 }
@@ -426,31 +414,31 @@
   EXPECT_EQ(270000, allocator_->GetStartBitrate(&not_enforced_observer));
   EXPECT_EQ(30000u, enforced_observer.last_bitrate_bps_);
 
-  allocator_->OnNetworkChanged(36000, 0, 50, kDefaultProbingIntervalMs);
+  allocator_->OnNetworkChanged(36000, 0, 50);
   EXPECT_EQ(6000u, enforced_observer.last_bitrate_bps_);
   EXPECT_EQ(30000u, not_enforced_observer.last_bitrate_bps_);
 
-  allocator_->OnNetworkChanged(35000, 0, 50, kDefaultProbingIntervalMs);
+  allocator_->OnNetworkChanged(35000, 0, 50);
   EXPECT_EQ(30000u, enforced_observer.last_bitrate_bps_);
   EXPECT_EQ(0u, not_enforced_observer.last_bitrate_bps_);
 
-  allocator_->OnNetworkChanged(5000, 0, 50, kDefaultProbingIntervalMs);
+  allocator_->OnNetworkChanged(5000, 0, 50);
   EXPECT_EQ(6000u, enforced_observer.last_bitrate_bps_);
   EXPECT_EQ(0u, not_enforced_observer.last_bitrate_bps_);
 
-  allocator_->OnNetworkChanged(36000, 0, 50, kDefaultProbingIntervalMs);
+  allocator_->OnNetworkChanged(36000, 0, 50);
   EXPECT_EQ(30000u, enforced_observer.last_bitrate_bps_);
   EXPECT_EQ(0u, not_enforced_observer.last_bitrate_bps_);
 
-  allocator_->OnNetworkChanged(55000, 0, 50, kDefaultProbingIntervalMs);
+  allocator_->OnNetworkChanged(55000, 0, 50);
   EXPECT_EQ(30000u, enforced_observer.last_bitrate_bps_);
   EXPECT_EQ(0u, not_enforced_observer.last_bitrate_bps_);
 
-  allocator_->OnNetworkChanged(56000, 0, 50, kDefaultProbingIntervalMs);
+  allocator_->OnNetworkChanged(56000, 0, 50);
   EXPECT_EQ(6000u, enforced_observer.last_bitrate_bps_);
   EXPECT_EQ(50000u, not_enforced_observer.last_bitrate_bps_);
 
-  allocator_->OnNetworkChanged(56000, 0, 50, kDefaultProbingIntervalMs);
+  allocator_->OnNetworkChanged(56000, 0, 50);
   EXPECT_EQ(16000u, enforced_observer.last_bitrate_bps_);
   EXPECT_EQ(40000u, not_enforced_observer.last_bitrate_bps_);
 
@@ -463,22 +451,22 @@
   allocator_->AddObserver(&observer, 30000, 300000, 0, false);
   EXPECT_EQ(300000, allocator_->GetStartBitrate(&observer));
 
-  allocator_->OnNetworkChanged(30000, 0, 50, kDefaultProbingIntervalMs);
+  allocator_->OnNetworkChanged(30000, 0, 50);
   EXPECT_EQ(30000u, observer.last_bitrate_bps_);
 
-  allocator_->OnNetworkChanged(20000, 0, 50, kDefaultProbingIntervalMs);
+  allocator_->OnNetworkChanged(20000, 0, 50);
   EXPECT_EQ(0u, observer.last_bitrate_bps_);
 
-  allocator_->OnNetworkChanged(30000, 0, 50, kDefaultProbingIntervalMs);
+  allocator_->OnNetworkChanged(30000, 0, 50);
   EXPECT_EQ(0u, observer.last_bitrate_bps_);
 
-  allocator_->OnNetworkChanged(49000, 0, 50, kDefaultProbingIntervalMs);
+  allocator_->OnNetworkChanged(49000, 0, 50);
   EXPECT_EQ(0u, observer.last_bitrate_bps_);
 
-  allocator_->OnNetworkChanged(50000, 0, 50, kDefaultProbingIntervalMs);
+  allocator_->OnNetworkChanged(50000, 0, 50);
   EXPECT_EQ(50000u, observer.last_bitrate_bps_);
 
-  allocator_->OnNetworkChanged(30000, 0, 50, kDefaultProbingIntervalMs);
+  allocator_->OnNetworkChanged(30000, 0, 50);
   EXPECT_EQ(30000u, observer.last_bitrate_bps_);
 
   allocator_->RemoveObserver(&observer);
@@ -489,36 +477,25 @@
   allocator_->AddObserver(&observer, 300000, 600000, 0, false);
   EXPECT_EQ(300000, allocator_->GetStartBitrate(&observer));
 
-  allocator_->OnNetworkChanged(300000, 0, 50, kDefaultProbingIntervalMs);
+  allocator_->OnNetworkChanged(300000, 0, 50);
   EXPECT_EQ(300000u, observer.last_bitrate_bps_);
 
-  allocator_->OnNetworkChanged(200000, 0, 50, kDefaultProbingIntervalMs);
+  allocator_->OnNetworkChanged(200000, 0, 50);
   EXPECT_EQ(0u, observer.last_bitrate_bps_);
 
-  allocator_->OnNetworkChanged(300000, 0, 50, kDefaultProbingIntervalMs);
+  allocator_->OnNetworkChanged(300000, 0, 50);
   EXPECT_EQ(0u, observer.last_bitrate_bps_);
 
-  allocator_->OnNetworkChanged(329000, 0, 50, kDefaultProbingIntervalMs);
+  allocator_->OnNetworkChanged(329000, 0, 50);
   EXPECT_EQ(0u, observer.last_bitrate_bps_);
 
-  allocator_->OnNetworkChanged(330000, 0, 50, kDefaultProbingIntervalMs);
+  allocator_->OnNetworkChanged(330000, 0, 50);
   EXPECT_EQ(330000u, observer.last_bitrate_bps_);
 
-  allocator_->OnNetworkChanged(300000, 0, 50, kDefaultProbingIntervalMs);
+  allocator_->OnNetworkChanged(300000, 0, 50);
   EXPECT_EQ(300000u, observer.last_bitrate_bps_);
 
   allocator_->RemoveObserver(&observer);
 }
 
-TEST_F(BitrateAllocatorTest, PassProbingInterval) {
-  TestBitrateObserver observer;
-  allocator_->AddObserver(&observer, 300000, 600000, 0, false);
-  EXPECT_EQ(300000, allocator_->GetStartBitrate(&observer));
-
-  allocator_->OnNetworkChanged(300000, 0, 50, 5000);
-  EXPECT_EQ(5000, observer.last_probing_interval_ms_);
-
-  allocator_->RemoveObserver(&observer);
-}
-
 }  // namespace webrtc