Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(513)

Unified Diff: webrtc/modules/congestion_controller/probing_interval_estimator_unittest.cc

Issue 2532993002: Revert of Pass time constant to bwe smoothing filter. (Closed)
Patch Set: Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webrtc/modules/congestion_controller/probing_interval_estimator_unittest.cc
diff --git a/webrtc/modules/congestion_controller/probing_interval_estimator_unittest.cc b/webrtc/modules/congestion_controller/probing_interval_estimator_unittest.cc
index bf10718860fab5a8d1a3526e5ef4d1c935eb0de4..051f3561d31bcc5302d29ef97d9644f00fc5a0d7 100644
--- a/webrtc/modules/congestion_controller/probing_interval_estimator_unittest.cc
+++ b/webrtc/modules/congestion_controller/probing_interval_estimator_unittest.cc
@@ -24,7 +24,6 @@
constexpr int kMinIntervalMs = 2000;
constexpr int kMaxIntervalMs = 50000;
-constexpr int kDefaultIntervalMs = 3000;
struct ProbingIntervalEstimatorStates {
std::unique_ptr<ProbingIntervalEstimator> probing_interval_estimator;
@@ -35,13 +34,12 @@
ProbingIntervalEstimatorStates states;
states.aimd_rate_control.reset(new MockAimdRateControl());
states.probing_interval_estimator.reset(new ProbingIntervalEstimator(
- kMinIntervalMs, kMaxIntervalMs, kDefaultIntervalMs,
- states.aimd_rate_control.get()));
+ kMinIntervalMs, kMaxIntervalMs, states.aimd_rate_control.get()));
return states;
}
} // namespace
-TEST(ProbingIntervalEstimatorTest, DefaultIntervalUntillWeHaveDrop) {
+TEST(ProbingIntervalEstimatorTest, NoIntervalUntillWeHaveDrop) {
auto states = CreateProbingIntervalEstimatorStates();
EXPECT_CALL(*states.aimd_rate_control, GetLastBitrateDecreaseBps())
@@ -51,9 +49,9 @@
.WillOnce(Return(4000))
.WillOnce(Return(4000));
- EXPECT_EQ(kDefaultIntervalMs,
+ EXPECT_EQ(rtc::Optional<int>(),
states.probing_interval_estimator->GetIntervalMs());
- EXPECT_NE(kDefaultIntervalMs,
+ EXPECT_NE(rtc::Optional<int>(),
states.probing_interval_estimator->GetIntervalMs());
}
@@ -63,7 +61,8 @@
.WillOnce(Return(rtc::Optional<int>(20000)));
EXPECT_CALL(*states.aimd_rate_control, GetNearMaxIncreaseRateBps())
.WillOnce(Return(5000));
- EXPECT_EQ(4000, states.probing_interval_estimator->GetIntervalMs());
+ EXPECT_EQ(rtc::Optional<int>(4000),
+ states.probing_interval_estimator->GetIntervalMs());
}
TEST(ProbingIntervalEstimatorTest, IntervalDoesNotExceedMin) {
@@ -72,7 +71,8 @@
.WillOnce(Return(rtc::Optional<int>(1000)));
EXPECT_CALL(*states.aimd_rate_control, GetNearMaxIncreaseRateBps())
.WillOnce(Return(5000));
- EXPECT_EQ(kMinIntervalMs, states.probing_interval_estimator->GetIntervalMs());
+ EXPECT_EQ(rtc::Optional<int>(kMinIntervalMs),
+ states.probing_interval_estimator->GetIntervalMs());
}
TEST(ProbingIntervalEstimatorTest, IntervalDoesNotExceedMax) {
@@ -81,6 +81,7 @@
.WillOnce(Return(rtc::Optional<int>(50000)));
EXPECT_CALL(*states.aimd_rate_control, GetNearMaxIncreaseRateBps())
.WillOnce(Return(100));
- EXPECT_EQ(kMaxIntervalMs, states.probing_interval_estimator->GetIntervalMs());
+ EXPECT_EQ(rtc::Optional<int>(kMaxIntervalMs),
+ states.probing_interval_estimator->GetIntervalMs());
}
} // namespace webrtc

Powered by Google App Engine
This is Rietveld 408576698