Move BWE period calculation from ProbingIntervalEstimator to AimdRateControl.

webrtc/modules/remote_bitrate_estimator/aimd_rate_control_unittest.cc

 /*
  *  Copyright (c) 2016 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 <memory>
 
 #include "webrtc/modules/remote_bitrate_estimator/aimd_rate_control.h"
 #include "webrtc/system_wrappers/include/clock.h"
 #include "webrtc/test/gtest.h"
 
 namespace webrtc {
 namespace {
 
 constexpr int64_t kClockInitialTime = 123456;
 
+constexpr int kMinIntervalMs = 2000;
+constexpr int kMaxIntervalMs = 50000;
+constexpr int kDefaultIntervalMs = 3000;
+
 struct AimdRateControlStates {
   std::unique_ptr<AimdRateControl> aimd_rate_control;
   std::unique_ptr<SimulatedClock> simulated_clock;
 };
 
 AimdRateControlStates CreateAimdRateControlStates() {
   AimdRateControlStates states;
   states.aimd_rate_control.reset(new AimdRateControl());
   states.simulated_clock.reset(new SimulatedClock(kClockInitialTime));
   return states;
@@ skipping 28 matching lines @@
 
 TEST(AimdRateControlTest, NearMaxIncreaseRateIs5kbpsOn60kbpsAnd100msRtt) {
   auto states = CreateAimdRateControlStates();
   constexpr int kBitrate = 60000;
   states.aimd_rate_control->SetEstimate(
       kBitrate, states.simulated_clock->TimeInMilliseconds());
   states.aimd_rate_control->SetRtt(100);
   EXPECT_EQ(5000, states.aimd_rate_control->GetNearMaxIncreaseRateBps());
 }
 
-TEST(AimdRateControlTest, UnknownBitrateDecreaseBeforeFirstOveruse) {
+TEST(AimdRateControlTest, DefaultPeriodBeforeFirstOveruse) {
   auto states = CreateAimdRateControlStates();
-  EXPECT_EQ(rtc::Optional<int>(),
-            states.aimd_rate_control->GetLastBitrateDecreaseBps());
+  EXPECT_EQ(3000, states.aimd_rate_control->GetExpectedBandwidthPeriodMs());
 }
 
 TEST(AimdRateControlTest, GetLastBitrateDecrease) {
   auto states = CreateAimdRateControlStates();
   constexpr int kBitrate = 300000;
   states.aimd_rate_control->SetEstimate(
       kBitrate, states.simulated_clock->TimeInMilliseconds());
-  UpdateRateControl(states, kBwOverusing, kBitrate - 2000,
+  UpdateRateControl(states, kBwOverusing, kBitrate,
                     states.simulated_clock->TimeInMilliseconds());
-  EXPECT_EQ(rtc::Optional<int>(46700),
-            states.aimd_rate_control->GetLastBitrateDecreaseBps());
+  EXPECT_NEAR(14000, states.aimd_rate_control->GetNearMaxIncreaseRateBps(),
+              1000);
+  ASSERT_TRUE(states.aimd_rate_control->GetExpectedBandwidthPeriodMs());
+  EXPECT_EQ(3000, states.aimd_rate_control->GetExpectedBandwidthPeriodMs());
 }
 
 TEST(AimdRateControlTest, BweLimitedByAckedBitrate) {
   auto states = CreateAimdRateControlStates();
   constexpr int kAckedBitrate = 10000;
   states.aimd_rate_control->SetEstimate(
       kAckedBitrate, states.simulated_clock->TimeInMilliseconds());
   while (states.simulated_clock->TimeInMilliseconds() - kClockInitialTime <
          20000) {
     UpdateRateControl(states, kBwNormal, kAckedBitrate,
@@ skipping 20 matching lines @@
   // If the acked bitrate decreases the BWE shouldn't be reduced to 1.5x
   // what's being acked, but also shouldn't get to increase more.
   uint32_t prev_estimate = states.aimd_rate_control->LatestEstimate();
   UpdateRateControl(states, kBwNormal, kAckedBitrate / 2,
                     states.simulated_clock->TimeInMilliseconds());
   uint32_t new_estimate = states.aimd_rate_control->LatestEstimate();
   EXPECT_NEAR(new_estimate, static_cast<uint32_t>(1.5 * kAckedBitrate + 10000),
               2000);
   EXPECT_EQ(new_estimate, prev_estimate);
 }
+
+TEST(AimdRateControlTest, DefaultIntervalUntilFirstOveruse) {

[michaelt, 2017/04/05 07:06:02]

Seams to be the same test as in DefaultPeriodBeforeFirstOveruse.

[terelius, 2017/04/05 10:58:03]

Done. Removed DefaultPeriodBeforeFirstOveruse.

+  auto states = CreateAimdRateControlStates();
+  states.aimd_rate_control->SetStartBitrate(300000);
+  EXPECT_EQ(kDefaultIntervalMs,
+            states.aimd_rate_control->GetExpectedBandwidthPeriodMs());
+  states.simulated_clock->AdvanceTimeMilliseconds(100);
+  UpdateRateControl(states, kBwOverusing, 100000,
+                    states.simulated_clock->TimeInMilliseconds());
+  EXPECT_NE(kDefaultIntervalMs,
+            states.aimd_rate_control->GetExpectedBandwidthPeriodMs());
+}
+
+TEST(AimdRateControlTest, CalcInterval) {

[michaelt, 2017/04/05 07:06:02]

Rename the test according to the new Function name.

[terelius, 2017/04/05 10:58:03]

Done.

+  auto states = CreateAimdRateControlStates();
+  constexpr int kInitialBitrate = 110000;
+  states.aimd_rate_control->SetEstimate(
+      kInitialBitrate, states.simulated_clock->TimeInMilliseconds());
+  states.simulated_clock->AdvanceTimeMilliseconds(100);
+  // Make the bitrate drop to 20 kbps fo get to 90 kbps.
+  // The rate increase at 90 kbps should be 5 kbps.
+  UpdateRateControl(states, kBwOverusing, (kInitialBitrate - 20000) / 0.85,
+                    states.simulated_clock->TimeInMilliseconds());
+  EXPECT_EQ(4000, states.aimd_rate_control->GetExpectedBandwidthPeriodMs());
+}
+
+TEST(AimdRateControlTest, IntervalNotBelowMin) {

[michaelt, 2017/04/05 07:06:02]

Same here.

[terelius, 2017/04/05 10:58:03]

Done.

+  auto states = CreateAimdRateControlStates();
+  constexpr int kInitialBitrate = 10000;
+  states.aimd_rate_control->SetEstimate(
+      kInitialBitrate, states.simulated_clock->TimeInMilliseconds());
+  states.simulated_clock->AdvanceTimeMilliseconds(100);
+  // Make a small (1.5 kbps) bitrate drop to 8.5 kbps.
+  UpdateRateControl(states, kBwOverusing, kInitialBitrate - 1,
+                    states.simulated_clock->TimeInMilliseconds());
+  EXPECT_EQ(kMinIntervalMs,
+            states.aimd_rate_control->GetExpectedBandwidthPeriodMs());
+}
+
+TEST(AimdRateControlTest, IntervalNotAboveMax) {

[michaelt, 2017/04/05 07:06:02]

Same here.

[terelius, 2017/04/05 10:58:03]

Done.

+  auto states = CreateAimdRateControlStates();
+  constexpr int kInitialBitrate = 10010000;
+  states.aimd_rate_control->SetEstimate(
+      kInitialBitrate, states.simulated_clock->TimeInMilliseconds());
+  states.simulated_clock->AdvanceTimeMilliseconds(100);
+  // Make a large (10 Mbps) bitrate drop to 10 kbps.
+  UpdateRateControl(states, kBwOverusing, 10000 / 0.85,
+                    states.simulated_clock->TimeInMilliseconds());
+  EXPECT_EQ(kMaxIntervalMs,
+            states.aimd_rate_control->GetExpectedBandwidthPeriodMs());
+}
+
 }  // namespace webrtc