Index: webrtc/base/ratetracker_unittest.cc |
diff --git a/webrtc/base/ratetracker_unittest.cc b/webrtc/base/ratetracker_unittest.cc |
index 1c20fd05a2732c7e14e61713fbe3da6d645f5bd5..043f53718b0797e9bf5ccae8f35696bc1791970c 100644 |
--- a/webrtc/base/ratetracker_unittest.cc |
+++ b/webrtc/base/ratetracker_unittest.cc |
@@ -1,5 +1,5 @@ |
/* |
- * Copyright 2010 The WebRTC Project Authors. All rights reserved. |
+ * Copyright 2015 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 |
@@ -15,7 +15,7 @@ namespace rtc { |
class RateTrackerForTest : public RateTracker { |
public: |
- RateTrackerForTest() : time_(0) {} |
+ RateTrackerForTest() : RateTracker(100u, 10u), time_(0) {} |
virtual uint32 Time() const { return time_; } |
void AdvanceTime(uint32 delta) { time_ += delta; } |
@@ -23,59 +23,140 @@ class RateTrackerForTest : public RateTracker { |
uint32 time_; |
}; |
-TEST(RateTrackerTest, TestBasics) { |
+TEST(RateTrackerTest, Test30FPS) { |
RateTrackerForTest tracker; |
- EXPECT_EQ(0U, tracker.total_units()); |
- EXPECT_EQ(0U, tracker.units_second()); |
+ |
+ for (int i = 0; i < 300; ++i) { |
+ tracker.AddSamples(1); |
+ tracker.AdvanceTime(33); |
+ if (i % 3 == 0) { |
+ tracker.AdvanceTime(1); |
+ } |
+ } |
+ EXPECT_DOUBLE_EQ(30.0, tracker.ComputeRateForInterval(50000u)); |
+} |
+ |
+TEST(RateTrackerTest, Test60FPS) { |
+ RateTrackerForTest tracker; |
+ |
+ for (int i = 0; i < 300; ++i) { |
+ tracker.AddSamples(1); |
+ tracker.AdvanceTime(16); |
+ if (i % 3 != 0) { |
+ tracker.AdvanceTime(1); |
+ } |
+ } |
+ EXPECT_DOUBLE_EQ(60.0, tracker.ComputeRateForInterval(1000u)); |
+} |
+ |
+TEST(RateTrackerTest, TestRateTrackerBasics) { |
+ RateTrackerForTest tracker; |
+ EXPECT_DOUBLE_EQ(0.0, tracker.ComputeRateForInterval(1000u)); |
// Add a sample. |
- tracker.Update(1234); |
+ tracker.AddSamples(1234); |
// Advance the clock by 100 ms. |
tracker.AdvanceTime(100); |
- // total_units should advance, but units_second should stay 0. |
- EXPECT_EQ(1234U, tracker.total_units()); |
- EXPECT_EQ(0U, tracker.units_second()); |
+ EXPECT_DOUBLE_EQ(12340.0, tracker.ComputeRateForInterval(1000u)); |
+ EXPECT_DOUBLE_EQ(12340.0, tracker.ComputeRate()); |
+ EXPECT_EQ(1234U, tracker.TotalSampleCount()); |
+ EXPECT_DOUBLE_EQ(12340.0, tracker.ComputeTotalRate()); |
// Repeat. |
- tracker.Update(1234); |
+ tracker.AddSamples(1234); |
tracker.AdvanceTime(100); |
- EXPECT_EQ(1234U * 2, tracker.total_units()); |
- EXPECT_EQ(0U, tracker.units_second()); |
+ EXPECT_DOUBLE_EQ(12340.0, tracker.ComputeRateForInterval(1000u)); |
+ EXPECT_DOUBLE_EQ(12340.0, tracker.ComputeRate()); |
+ EXPECT_EQ(1234U * 2, tracker.TotalSampleCount()); |
+ EXPECT_DOUBLE_EQ(12340.0, tracker.ComputeTotalRate()); |
// Advance the clock by 800 ms, so we've elapsed a full second. |
// units_second should now be filled in properly. |
tracker.AdvanceTime(800); |
- EXPECT_EQ(1234U * 2, tracker.total_units()); |
- EXPECT_EQ(1234U * 2, tracker.units_second()); |
+ EXPECT_DOUBLE_EQ(1234.0 * 2.0, tracker.ComputeRateForInterval(1000u)); |
+ EXPECT_DOUBLE_EQ(1234.0 * 2.0, tracker.ComputeRate()); |
+ EXPECT_EQ(1234U * 2, tracker.TotalSampleCount()); |
+ EXPECT_DOUBLE_EQ(1234.0 * 2.0, tracker.ComputeTotalRate()); |
// Poll the tracker again immediately. The reported rate should stay the same. |
- EXPECT_EQ(1234U * 2, tracker.total_units()); |
- EXPECT_EQ(1234U * 2, tracker.units_second()); |
+ EXPECT_DOUBLE_EQ(1234.0 * 2.0, tracker.ComputeRateForInterval(1000u)); |
+ EXPECT_DOUBLE_EQ(1234.0 * 2.0, tracker.ComputeRate()); |
+ EXPECT_EQ(1234U * 2, tracker.TotalSampleCount()); |
+ EXPECT_DOUBLE_EQ(1234.0 * 2.0, tracker.ComputeTotalRate()); |
// Do nothing and advance by a second. We should drop down to zero. |
tracker.AdvanceTime(1000); |
- EXPECT_EQ(1234U * 2, tracker.total_units()); |
- EXPECT_EQ(0U, tracker.units_second()); |
+ EXPECT_DOUBLE_EQ(0.0, tracker.ComputeRateForInterval(1000u)); |
+ EXPECT_DOUBLE_EQ(0.0, tracker.ComputeRate()); |
+ EXPECT_EQ(1234U * 2, tracker.TotalSampleCount()); |
+ EXPECT_DOUBLE_EQ(1234.0, tracker.ComputeTotalRate()); |
// Send a bunch of data at a constant rate for 5.5 "seconds". |
// We should report the rate properly. |
for (int i = 0; i < 5500; i += 100) { |
- tracker.Update(9876U); |
+ tracker.AddSamples(9876U); |
tracker.AdvanceTime(100); |
} |
- EXPECT_EQ(9876U * 10, tracker.units_second()); |
+ EXPECT_DOUBLE_EQ(9876.0 * 10.0, tracker.ComputeRateForInterval(1000u)); |
+ EXPECT_DOUBLE_EQ(9876.0 * 10.0, tracker.ComputeRate()); |
+ EXPECT_EQ(1234U * 2 + 9876U * 55, tracker.TotalSampleCount()); |
+ EXPECT_DOUBLE_EQ((1234.0 * 2.0 + 9876.0 * 55.0) / 7.5, |
+ tracker.ComputeTotalRate()); |
// Advance the clock by 500 ms. Since we sent nothing over this half-second, |
// the reported rate should be reduced by half. |
tracker.AdvanceTime(500); |
- EXPECT_EQ(9876U * 5, tracker.units_second()); |
+ EXPECT_DOUBLE_EQ(9876.0 * 5.0, tracker.ComputeRateForInterval(1000u)); |
+ EXPECT_DOUBLE_EQ(9876.0 * 5.0, tracker.ComputeRate()); |
+ EXPECT_EQ(1234U * 2 + 9876U * 55, tracker.TotalSampleCount()); |
+ EXPECT_DOUBLE_EQ((1234.0 * 2.0 + 9876.0 * 55.0) / 8.0, |
+ tracker.ComputeTotalRate()); |
+ |
+ // Rate over the last half second should be zero. |
+ EXPECT_DOUBLE_EQ(0.0, tracker.ComputeRateForInterval(500u)); |
+} |
+ |
+TEST(RateTrackerTest, TestLongPeriodBetweenSamples) { |
+ RateTrackerForTest tracker; |
+ tracker.AddSamples(1); |
+ tracker.AdvanceTime(1000); |
+ EXPECT_DOUBLE_EQ(1.0, tracker.ComputeRate()); |
+ |
+ tracker.AdvanceTime(2000); |
+ EXPECT_DOUBLE_EQ(0.0, tracker.ComputeRate()); |
+ |
+ tracker.AdvanceTime(2000); |
+ tracker.AddSamples(1); |
+ EXPECT_DOUBLE_EQ(1.0, tracker.ComputeRate()); |
+} |
+ |
+TEST(RateTrackerTest, TestRolloff) { |
+ RateTrackerForTest tracker; |
+ for (int i = 0; i < 10; ++i) { |
+ tracker.AddSamples(1U); |
+ tracker.AdvanceTime(100); |
+ } |
+ EXPECT_DOUBLE_EQ(10.0, tracker.ComputeRate()); |
+ |
+ for (int i = 0; i < 10; ++i) { |
+ tracker.AddSamples(1U); |
+ tracker.AdvanceTime(50); |
+ } |
+ EXPECT_DOUBLE_EQ(15.0, tracker.ComputeRate()); |
+ EXPECT_DOUBLE_EQ(20.0, tracker.ComputeRateForInterval(500u)); |
+ |
+ for (int i = 0; i < 10; ++i) { |
+ tracker.AddSamples(1U); |
+ tracker.AdvanceTime(50); |
+ } |
+ EXPECT_DOUBLE_EQ(20.0, tracker.ComputeRate()); |
} |
TEST(RateTrackerTest, TestGetUnitSecondsAfterInitialValue) { |
RateTrackerForTest tracker; |
- tracker.Update(1234); |
+ tracker.AddSamples(1234); |
tracker.AdvanceTime(1000); |
- EXPECT_EQ(1234u, tracker.units_second()); |
+ EXPECT_DOUBLE_EQ(1234.0, tracker.ComputeRateForInterval(1000u)); |
} |
} // namespace rtc |