Reimplemeted "Test and fix for huge bwe drop after alr state"

webrtc/modules/pacing/alr_detector_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 "webrtc/modules/pacing/alr_detector.h"
 
+#include "webrtc/rtc_base/fakeclock.h"

[philipel, 2017/07/14 13:56:23]

Used?

[tschumi, 2017/07/14 15:36:51]

Removed

 #include "webrtc/test/gtest.h"
 
 namespace {
 
 constexpr int kEstimatedBitrateBps = 300000;
+// constexpr int64_t kAlrEndedTimeMs = 1234;

[philipel, 2017/07/14 13:56:23]

remove

[tschumi, 2017/07/14 15:36:51]

Done.

 
 }  // namespace
 
 namespace webrtc {
 
 namespace {
 class SimulateOutgoingTrafficIn {
  public:
   explicit SimulateOutgoingTrafficIn(AlrDetector* alr_detector)
       : alr_detector_(alr_detector) {
@@ skipping 51 matching lines @@
   EXPECT_FALSE(alr_detector_.GetApplicationLimitedRegionStartTime());
 
   // Stay in non-ALR state when usage is close to 100%.
   SimulateOutgoingTrafficIn(&alr_detector_)
       .ForTimeMs(1000)
       .AtPercentOfEstimatedBitrate(90);
   EXPECT_FALSE(alr_detector_.GetApplicationLimitedRegionStartTime());
 
   // Verify that we ALR starts when bitrate drops below 20%.
   SimulateOutgoingTrafficIn(&alr_detector_)
-      .ForTimeMs(1000)
+      .ForTimeMs(1500)
       .AtPercentOfEstimatedBitrate(20);
   EXPECT_TRUE(alr_detector_.GetApplicationLimitedRegionStartTime());
 
   // Verify that ALR ends when usage is above 65%.
   SimulateOutgoingTrafficIn(&alr_detector_)
       .ForTimeMs(1000)
       .AtPercentOfEstimatedBitrate(100);
   EXPECT_FALSE(alr_detector_.GetApplicationLimitedRegionStartTime());
 }
 
 TEST_F(AlrDetectorTest, ShortSpike) {
   // Start in non-ALR state.
   EXPECT_FALSE(alr_detector_.GetApplicationLimitedRegionStartTime());
 
   // Verify that we ALR starts when bitrate drops below 20%.
   SimulateOutgoingTrafficIn(&alr_detector_)
       .ForTimeMs(1000)
       .AtPercentOfEstimatedBitrate(20);
   EXPECT_TRUE(alr_detector_.GetApplicationLimitedRegionStartTime());
 
   // Verify that we stay in ALR region even after a short bitrate spike.
   SimulateOutgoingTrafficIn(&alr_detector_)
-      .ForTimeMs(200)
+      .ForTimeMs(100)
       .AtPercentOfEstimatedBitrate(150);
   EXPECT_TRUE(alr_detector_.GetApplicationLimitedRegionStartTime());
 
   // ALR ends when usage is above 65%.
   SimulateOutgoingTrafficIn(&alr_detector_)
       .ForTimeMs(1000)
       .AtPercentOfEstimatedBitrate(100);
   EXPECT_FALSE(alr_detector_.GetApplicationLimitedRegionStartTime());
 }
 
@@ skipping 12 matching lines @@
   // traffic. This is necessary to ensure that ProbeController can still react
   // to the BWE drop by initiating a new probe.
   alr_detector_.SetEstimatedBitrate(kEstimatedBitrateBps / 5);
   EXPECT_TRUE(alr_detector_.GetApplicationLimitedRegionStartTime());
   SimulateOutgoingTrafficIn(&alr_detector_)
       .ForTimeMs(1000)
       .AtPercentOfEstimatedBitrate(50);
   EXPECT_FALSE(alr_detector_.GetApplicationLimitedRegionStartTime());
 }
 
+TEST(AlrStateTest, NotStateChangeWhenNoStartTimeProvided) {
+  AlrState alr_state;
+  EXPECT_FALSE(alr_state.HasChangedTo(AlrState::State::kNotInAlr));
+  EXPECT_FALSE(alr_state.HasChangedTo(AlrState::State::kInAlr));
+}
+
+TEST(AlrStateTest, StateChangeToInAlr) {
+  AlrState alr_state;
+  alr_state.Update(rtc::Optional<int64_t>(10));
+  EXPECT_FALSE(alr_state.HasChangedTo(AlrState::State::kNotInAlr));
+  EXPECT_TRUE(alr_state.HasChangedTo(AlrState::State::kInAlr));
+}
+
+TEST(AlrStateTest, StateChangeToNotInAlr) {
+  AlrState alr_state;
+  alr_state.Update(rtc::Optional<int64_t>(10));
+  alr_state.Update(rtc::Optional<int64_t>());
+  EXPECT_TRUE(alr_state.HasChangedTo(AlrState::State::kNotInAlr));
+  EXPECT_FALSE(alr_state.HasChangedTo(AlrState::State::kInAlr));
+}
+
 }  // namespace webrtc