Index: webrtc/modules/congestion_controller/probe_bitrate_estimator_unittest.cc |
diff --git a/webrtc/modules/congestion_controller/probe_bitrate_controller_unittest.cc b/webrtc/modules/congestion_controller/probe_bitrate_estimator_unittest.cc |
similarity index 85% |
rename from webrtc/modules/congestion_controller/probe_bitrate_controller_unittest.cc |
rename to webrtc/modules/congestion_controller/probe_bitrate_estimator_unittest.cc |
index 40beb0f2f3488bbed1b815cbb9937a48528724cd..e3bbd5a22793e2d8a73c0a277ae02f9fc036acb9 100644 |
--- a/webrtc/modules/congestion_controller/probe_bitrate_controller_unittest.cc |
+++ b/webrtc/modules/congestion_controller/probe_bitrate_estimator_unittest.cc |
@@ -24,12 +24,13 @@ class TestProbeBitrateEstimator : public ::testing::Test { |
TestProbeBitrateEstimator() : probe_bitrate_estimator_() {} |
void AddPacketFeedback(int probe_cluster_id, |
- size_t size, |
+ size_t size_bytes, |
int64_t send_time_ms, |
int64_t arrival_time_ms) { |
- PacketInfo info(arrival_time_ms, send_time_ms, 0, size, probe_cluster_id); |
+ PacketInfo info(arrival_time_ms, send_time_ms, 0, size_bytes, |
+ probe_cluster_id); |
ProbingResult res = probe_bitrate_estimator_.PacketFeedback(info); |
- if (res.bps != ProbingResult::kNoEstimate) |
+ if (res.valid()) |
results_.emplace_back(res.bps, res.timestamp); |
} |
@@ -48,18 +49,18 @@ TEST_F(TestProbeBitrateEstimator, OneCluster) { |
AddPacketFeedback(0, 1000, 0, 10); |
AddPacketFeedback(0, 1000, 10, 20); |
AddPacketFeedback(0, 1000, 20, 30); |
- AddPacketFeedback(0, 1000, 40, 50); |
+ AddPacketFeedback(0, 1000, 30, 40); |
- CheckResult(0, 100000, 10, 50); |
+ CheckResult(0, 800000, 10, 40); |
} |
TEST_F(TestProbeBitrateEstimator, FastReceive) { |
AddPacketFeedback(0, 1000, 0, 15); |
AddPacketFeedback(0, 1000, 10, 30); |
- AddPacketFeedback(0, 1000, 20, 40); |
- AddPacketFeedback(0, 1000, 40, 50); |
+ AddPacketFeedback(0, 1000, 20, 35); |
+ AddPacketFeedback(0, 1000, 30, 40); |
- CheckResult(0, 100000, 10, 50); |
+ CheckResult(0, 800000, 10, 40); |
} |
TEST_F(TestProbeBitrateEstimator, TooFastReceive) { |
@@ -75,9 +76,9 @@ TEST_F(TestProbeBitrateEstimator, SlowReceive) { |
AddPacketFeedback(0, 1000, 0, 10); |
AddPacketFeedback(0, 1000, 10, 40); |
AddPacketFeedback(0, 1000, 20, 70); |
- AddPacketFeedback(0, 1000, 40, 110); |
+ AddPacketFeedback(0, 1000, 30, 85); |
- CheckResult(0, 40000, 10, 110); |
+ CheckResult(0, 320000, 10, 85); |
} |
TEST_F(TestProbeBitrateEstimator, BurstReceive) { |
@@ -96,15 +97,15 @@ TEST_F(TestProbeBitrateEstimator, MultipleClusters) { |
AddPacketFeedback(0, 1000, 40, 60); |
AddPacketFeedback(0, 1000, 50, 60); |
- CheckResult(0, 80000, 10, 60); |
- CheckResult(1, 100000, 10, 60); |
+ CheckResult(0, 480000, 10, 60); |
+ CheckResult(1, 640000, 10, 60); |
AddPacketFeedback(1, 1000, 60, 70); |
AddPacketFeedback(1, 1000, 65, 77); |
AddPacketFeedback(1, 1000, 70, 84); |
AddPacketFeedback(1, 1000, 75, 90); |
- CheckResult(2, 200000, 10, 90); |
+ CheckResult(2, 1200000, 10, 90); |
} |
TEST_F(TestProbeBitrateEstimator, OldProbe) { |
@@ -117,7 +118,7 @@ TEST_F(TestProbeBitrateEstimator, OldProbe) { |
AddPacketFeedback(1, 1000, 70, 84); |
AddPacketFeedback(1, 1000, 75, 90); |
- CheckResult(0, 200000, 10, 90); |
+ CheckResult(0, 1200000, 10, 90); |
AddPacketFeedback(0, 1000, 40, 60); |