| Index: media/cast/rtp_receiver/receiver_stats_unittest.cc
|
| diff --git a/media/cast/rtp_receiver/receiver_stats_unittest.cc b/media/cast/rtp_receiver/receiver_stats_unittest.cc
|
| index 2788cb592de5a24502a83281bf38b9549c1f967c..b2da051a620cd87050f70547e7d566a6d169ff1a 100644
|
| --- a/media/cast/rtp_receiver/receiver_stats_unittest.cc
|
| +++ b/media/cast/rtp_receiver/receiver_stats_unittest.cc
|
| @@ -26,15 +26,12 @@ class ReceiverStatsTest : public ::testing::Test {
|
| jitter_(0) {
|
| testing_clock_.Advance(
|
| base::TimeDelta::FromMilliseconds(kStartMillisecond));
|
| - start_time_ = testing_clock_.NowTicks();
|
| + start_time_ = testing_clock_.NowTicks();
|
| delta_increments_ = base::TimeDelta::FromMilliseconds(kStdTimeIncrementMs);
|
| - }
|
| - virtual ~ReceiverStatsTest() {}
|
| -
|
| - virtual void SetUp() {
|
| rtp_header_.webrtc.header.sequenceNumber = 0;
|
| rtp_header_.webrtc.header.timestamp = 0;
|
| }
|
| + virtual ~ReceiverStatsTest() {}
|
|
|
| uint32 ExpectedJitter(uint32 const_interval, int num_packets) {
|
| float jitter = 0;
|
| @@ -56,11 +53,15 @@ class ReceiverStatsTest : public ::testing::Test {
|
| base::SimpleTestTickClock testing_clock_;
|
| base::TimeTicks start_time_;
|
| base::TimeDelta delta_increments_;
|
| +
|
| + DISALLOW_COPY_AND_ASSIGN(ReceiverStatsTest);
|
| };
|
|
|
| TEST_F(ReceiverStatsTest, ResetState) {
|
| - stats_.GetStatistics(&fraction_lost_, &cumulative_lost_,
|
| - &extended_high_sequence_number_, &jitter_);
|
| + stats_.GetStatistics(&fraction_lost_,
|
| + &cumulative_lost_,
|
| + &extended_high_sequence_number_,
|
| + &jitter_);
|
| EXPECT_EQ(0u, fraction_lost_);
|
| EXPECT_EQ(0u, cumulative_lost_);
|
| EXPECT_EQ(0u, extended_high_sequence_number_);
|
| @@ -77,8 +78,10 @@ TEST_F(ReceiverStatsTest, LossCount) {
|
| ++rtp_header_.webrtc.header.sequenceNumber;
|
| testing_clock_.Advance(delta_increments_);
|
| }
|
| - stats_.GetStatistics(&fraction_lost_, &cumulative_lost_,
|
| - &extended_high_sequence_number_, &jitter_);
|
| + stats_.GetStatistics(&fraction_lost_,
|
| + &cumulative_lost_,
|
| + &extended_high_sequence_number_,
|
| + &jitter_);
|
| EXPECT_EQ(63u, fraction_lost_);
|
| EXPECT_EQ(74u, cumulative_lost_);
|
| // Build extended sequence number.
|
| @@ -89,20 +92,22 @@ TEST_F(ReceiverStatsTest, LossCount) {
|
| TEST_F(ReceiverStatsTest, NoLossWrap) {
|
| rtp_header_.webrtc.header.sequenceNumber = 65500;
|
| for (int i = 0; i < 300; ++i) {
|
| - stats_.UpdateStatistics(rtp_header_);
|
| + stats_.UpdateStatistics(rtp_header_);
|
| if (i % 3) {
|
| rtp_header_.webrtc.header.timestamp += 33 * 90;
|
| }
|
| ++rtp_header_.webrtc.header.sequenceNumber;
|
| testing_clock_.Advance(delta_increments_);
|
| }
|
| - stats_.GetStatistics(&fraction_lost_, &cumulative_lost_,
|
| - &extended_high_sequence_number_, &jitter_);
|
| + stats_.GetStatistics(&fraction_lost_,
|
| + &cumulative_lost_,
|
| + &extended_high_sequence_number_,
|
| + &jitter_);
|
| EXPECT_EQ(0u, fraction_lost_);
|
| EXPECT_EQ(0u, cumulative_lost_);
|
| // Build extended sequence number (one wrap cycle).
|
| - uint32 extended_seq_num = (1 << 16) +
|
| - rtp_header_.webrtc.header.sequenceNumber - 1;
|
| + uint32 extended_seq_num =
|
| + (1 << 16) + rtp_header_.webrtc.header.sequenceNumber - 1;
|
| EXPECT_EQ(extended_seq_num, extended_high_sequence_number_);
|
| }
|
|
|
| @@ -118,13 +123,15 @@ TEST_F(ReceiverStatsTest, LossCountWrap) {
|
| ++rtp_header_.webrtc.header.sequenceNumber;
|
| testing_clock_.Advance(delta_increments_);
|
| }
|
| - stats_.GetStatistics(&fraction_lost_, &cumulative_lost_,
|
| - &extended_high_sequence_number_, &jitter_);
|
| + stats_.GetStatistics(&fraction_lost_,
|
| + &cumulative_lost_,
|
| + &extended_high_sequence_number_,
|
| + &jitter_);
|
| EXPECT_EQ(63u, fraction_lost_);
|
| EXPECT_EQ(74u, cumulative_lost_);
|
| // Build extended sequence number (one wrap cycle).
|
| - uint32 extended_seq_num = (1 << 16) +
|
| - rtp_header_.webrtc.header.sequenceNumber - 1;
|
| + uint32 extended_seq_num =
|
| + (1 << 16) + rtp_header_.webrtc.header.sequenceNumber - 1;
|
| EXPECT_EQ(extended_seq_num, extended_high_sequence_number_);
|
| }
|
|
|
| @@ -135,8 +142,10 @@ TEST_F(ReceiverStatsTest, BasicJitter) {
|
| rtp_header_.webrtc.header.timestamp += 33 * 90;
|
| testing_clock_.Advance(delta_increments_);
|
| }
|
| - stats_.GetStatistics(&fraction_lost_, &cumulative_lost_,
|
| - &extended_high_sequence_number_, &jitter_);
|
| + stats_.GetStatistics(&fraction_lost_,
|
| + &cumulative_lost_,
|
| + &extended_high_sequence_number_,
|
| + &jitter_);
|
| EXPECT_FALSE(fraction_lost_);
|
| EXPECT_FALSE(cumulative_lost_);
|
| // Build extended sequence number (one wrap cycle).
|
| @@ -155,15 +164,17 @@ TEST_F(ReceiverStatsTest, NonTrivialJitter) {
|
| base::TimeDelta::FromMilliseconds(kAdditionalIncrement);
|
| testing_clock_.Advance(delta_increments_ + additional_delta);
|
| }
|
| - stats_.GetStatistics(&fraction_lost_, &cumulative_lost_,
|
| - &extended_high_sequence_number_, &jitter_);
|
| + stats_.GetStatistics(&fraction_lost_,
|
| + &cumulative_lost_,
|
| + &extended_high_sequence_number_,
|
| + &jitter_);
|
| EXPECT_FALSE(fraction_lost_);
|
| EXPECT_FALSE(cumulative_lost_);
|
| // Build extended sequence number (one wrap cycle).
|
| uint32 extended_seq_num = rtp_header_.webrtc.header.sequenceNumber - 1;
|
| EXPECT_EQ(extended_seq_num, extended_high_sequence_number_);
|
| - EXPECT_EQ(
|
| - ExpectedJitter(kStdTimeIncrementMs + kAdditionalIncrement, 300), jitter_);
|
| + EXPECT_EQ(ExpectedJitter(kStdTimeIncrementMs + kAdditionalIncrement, 300),
|
| + jitter_);
|
| }
|
|
|
| } // namespace cast
|
|
|