Index: webrtc/base/ratetracker_unittest.cc |
diff --git a/webrtc/base/ratetracker_unittest.cc b/webrtc/base/ratetracker_unittest.cc |
index 75fec55818826fbc45a113ea529bedf6a30d7f82..136934fea34df743d334171f5b51c7cb1a293391 100644 |
--- a/webrtc/base/ratetracker_unittest.cc |
+++ b/webrtc/base/ratetracker_unittest.cc |
@@ -19,11 +19,11 @@ namespace { |
class RateTrackerForTest : public RateTracker { |
public: |
RateTrackerForTest() : RateTracker(kBucketIntervalMs, 10u), time_(0) {} |
- virtual uint32_t Time() const { return time_; } |
- void AdvanceTime(uint32_t delta) { time_ += delta; } |
+ virtual int64_t Time() const { return time_; } |
+ void AdvanceTime(int delta) { time_ += delta; } |
private: |
- uint32_t time_; |
+ int64_t time_; |
}; |
TEST(RateTrackerTest, Test30FPS) { |
@@ -36,7 +36,7 @@ TEST(RateTrackerTest, Test30FPS) { |
tracker.AdvanceTime(1); |
} |
} |
- EXPECT_DOUBLE_EQ(30.0, tracker.ComputeRateForInterval(50000u)); |
+ EXPECT_DOUBLE_EQ(30.0, tracker.ComputeRateForInterval(50000)); |
} |
TEST(RateTrackerTest, Test60FPS) { |
@@ -49,12 +49,12 @@ TEST(RateTrackerTest, Test60FPS) { |
tracker.AdvanceTime(1); |
} |
} |
- EXPECT_DOUBLE_EQ(60.0, tracker.ComputeRateForInterval(1000u)); |
+ EXPECT_DOUBLE_EQ(60.0, tracker.ComputeRateForInterval(1000)); |
} |
TEST(RateTrackerTest, TestRateTrackerBasics) { |
RateTrackerForTest tracker; |
- EXPECT_DOUBLE_EQ(0.0, tracker.ComputeRateForInterval(1000u)); |
+ EXPECT_DOUBLE_EQ(0.0, tracker.ComputeRateForInterval(1000)); |
// Add a sample. |
tracker.AddSamples(1234); |
@@ -63,7 +63,7 @@ TEST(RateTrackerTest, TestRateTrackerBasics) { |
EXPECT_DOUBLE_EQ(0.0, tracker.ComputeRate()); |
// Advance the clock by 100 ms (one bucket interval). |
tracker.AdvanceTime(1); |
- EXPECT_DOUBLE_EQ(12340.0, tracker.ComputeRateForInterval(1000u)); |
+ EXPECT_DOUBLE_EQ(12340.0, tracker.ComputeRateForInterval(1000)); |
EXPECT_DOUBLE_EQ(12340.0, tracker.ComputeRate()); |
EXPECT_EQ(1234U, tracker.TotalSampleCount()); |
EXPECT_DOUBLE_EQ(12340.0, tracker.ComputeTotalRate()); |
@@ -71,7 +71,7 @@ TEST(RateTrackerTest, TestRateTrackerBasics) { |
// Repeat. |
tracker.AddSamples(1234); |
tracker.AdvanceTime(100); |
- EXPECT_DOUBLE_EQ(12340.0, tracker.ComputeRateForInterval(1000u)); |
+ EXPECT_DOUBLE_EQ(12340.0, tracker.ComputeRateForInterval(1000)); |
EXPECT_DOUBLE_EQ(12340.0, tracker.ComputeRate()); |
EXPECT_EQ(1234U * 2, tracker.TotalSampleCount()); |
EXPECT_DOUBLE_EQ(12340.0, tracker.ComputeTotalRate()); |
@@ -79,20 +79,20 @@ TEST(RateTrackerTest, TestRateTrackerBasics) { |
// 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_DOUBLE_EQ(1234.0 * 2.0, tracker.ComputeRateForInterval(1000u)); |
+ EXPECT_DOUBLE_EQ(1234.0 * 2.0, tracker.ComputeRateForInterval(1000)); |
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_DOUBLE_EQ(1234.0 * 2.0, tracker.ComputeRateForInterval(1000u)); |
+ EXPECT_DOUBLE_EQ(1234.0 * 2.0, tracker.ComputeRateForInterval(1000)); |
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_DOUBLE_EQ(0.0, tracker.ComputeRateForInterval(1000u)); |
+ EXPECT_DOUBLE_EQ(0.0, tracker.ComputeRateForInterval(1000)); |
EXPECT_DOUBLE_EQ(0.0, tracker.ComputeRate()); |
EXPECT_EQ(1234U * 2, tracker.TotalSampleCount()); |
EXPECT_DOUBLE_EQ(1234.0, tracker.ComputeTotalRate()); |
@@ -103,7 +103,7 @@ TEST(RateTrackerTest, TestRateTrackerBasics) { |
tracker.AddSamples(9876U); |
tracker.AdvanceTime(100); |
} |
- EXPECT_DOUBLE_EQ(9876.0 * 10.0, tracker.ComputeRateForInterval(1000u)); |
+ EXPECT_DOUBLE_EQ(9876.0 * 10.0, tracker.ComputeRateForInterval(1000)); |
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, |
@@ -112,14 +112,14 @@ TEST(RateTrackerTest, TestRateTrackerBasics) { |
// 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_DOUBLE_EQ(9876.0 * 5.0, tracker.ComputeRateForInterval(1000u)); |
+ EXPECT_DOUBLE_EQ(9876.0 * 5.0, tracker.ComputeRateForInterval(1000)); |
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)); |
+ EXPECT_DOUBLE_EQ(0.0, tracker.ComputeRateForInterval(500)); |
} |
TEST(RateTrackerTest, TestLongPeriodBetweenSamples) { |
@@ -149,7 +149,7 @@ TEST(RateTrackerTest, TestRolloff) { |
tracker.AdvanceTime(50); |
} |
EXPECT_DOUBLE_EQ(15.0, tracker.ComputeRate()); |
- EXPECT_DOUBLE_EQ(20.0, tracker.ComputeRateForInterval(500u)); |
+ EXPECT_DOUBLE_EQ(20.0, tracker.ComputeRateForInterval(500)); |
for (int i = 0; i < 10; ++i) { |
tracker.AddSamples(1U); |
@@ -162,7 +162,7 @@ TEST(RateTrackerTest, TestGetUnitSecondsAfterInitialValue) { |
RateTrackerForTest tracker; |
tracker.AddSamples(1234); |
tracker.AdvanceTime(1000); |
- EXPECT_DOUBLE_EQ(1234.0, tracker.ComputeRateForInterval(1000u)); |
+ EXPECT_DOUBLE_EQ(1234.0, tracker.ComputeRateForInterval(1000)); |
} |
} // namespace rtc |