Index: media/cast/net/rtp/receiver_stats_unittest.cc |
diff --git a/media/cast/net/rtp/receiver_stats_unittest.cc b/media/cast/net/rtp/receiver_stats_unittest.cc |
index 9784b90a7d4778a732e238ff01a084cf57f845ce..1426f7839ae75c7cb43ec2562b6e1a28d6a338d0 100644 |
--- a/media/cast/net/rtp/receiver_stats_unittest.cc |
+++ b/media/cast/net/rtp/receiver_stats_unittest.cc |
@@ -8,6 +8,7 @@ |
#include "base/test/simple_test_tick_clock.h" |
#include "base/time/time.h" |
+#include "media/cast/constants.h" |
#include "media/cast/net/rtp/receiver_stats.h" |
#include "media/cast/net/rtp/rtp_defines.h" |
@@ -60,9 +61,10 @@ TEST_F(ReceiverStatsTest, ResetState) { |
TEST_F(ReceiverStatsTest, LossCount) { |
for (int i = 0; i < 300; ++i) { |
if (i % 4) |
- stats_.UpdateStatistics(rtp_header_); |
+ stats_.UpdateStatistics(rtp_header_, kVideoFrequency); |
if (i % 3) { |
- rtp_header_.rtp_timestamp += 33 * 90; |
+ rtp_header_.rtp_timestamp += RtpTimeDelta::FromTimeDelta( |
+ base::TimeDelta::FromMilliseconds(33), kVideoFrequency); |
} |
++rtp_header_.sequence_number; |
testing_clock_.Advance(delta_increments_); |
@@ -78,9 +80,10 @@ TEST_F(ReceiverStatsTest, LossCount) { |
TEST_F(ReceiverStatsTest, NoLossWrap) { |
rtp_header_.sequence_number = 65500; |
for (int i = 0; i < 300; ++i) { |
- stats_.UpdateStatistics(rtp_header_); |
+ stats_.UpdateStatistics(rtp_header_, kVideoFrequency); |
if (i % 3) { |
- rtp_header_.rtp_timestamp += 33 * 90; |
+ rtp_header_.rtp_timestamp += RtpTimeDelta::FromTimeDelta( |
+ base::TimeDelta::FromMilliseconds(33), kVideoFrequency); |
} |
++rtp_header_.sequence_number; |
testing_clock_.Advance(delta_increments_); |
@@ -98,10 +101,9 @@ TEST_F(ReceiverStatsTest, LossCountWrap) { |
rtp_header_.sequence_number = kStartSequenceNumber; |
for (int i = 0; i < 300; ++i) { |
if (i % 4) |
- stats_.UpdateStatistics(rtp_header_); |
+ stats_.UpdateStatistics(rtp_header_, kVideoFrequency); |
if (i % 3) |
- // Update timestamp. |
- ++rtp_header_.rtp_timestamp; |
+ rtp_header_.rtp_timestamp += RtpTimeDelta::FromTicks(1); |
++rtp_header_.sequence_number; |
testing_clock_.Advance(delta_increments_); |
} |
@@ -115,9 +117,10 @@ TEST_F(ReceiverStatsTest, LossCountWrap) { |
TEST_F(ReceiverStatsTest, BasicJitter) { |
for (int i = 0; i < 300; ++i) { |
- stats_.UpdateStatistics(rtp_header_); |
+ stats_.UpdateStatistics(rtp_header_, kVideoFrequency); |
++rtp_header_.sequence_number; |
- rtp_header_.rtp_timestamp += 33 * 90; |
+ rtp_header_.rtp_timestamp += RtpTimeDelta::FromTimeDelta( |
+ base::TimeDelta::FromMilliseconds(33), kVideoFrequency); |
testing_clock_.Advance(delta_increments_); |
} |
RtpReceiverStatistics s = stats_.GetStatistics(); |
@@ -132,9 +135,10 @@ TEST_F(ReceiverStatsTest, BasicJitter) { |
TEST_F(ReceiverStatsTest, NonTrivialJitter) { |
const int kAdditionalIncrement = 5; |
for (int i = 0; i < 300; ++i) { |
- stats_.UpdateStatistics(rtp_header_); |
+ stats_.UpdateStatistics(rtp_header_, kVideoFrequency); |
++rtp_header_.sequence_number; |
- rtp_header_.rtp_timestamp += 33 * 90; |
+ rtp_header_.rtp_timestamp += RtpTimeDelta::FromTimeDelta( |
+ base::TimeDelta::FromMilliseconds(33), kVideoFrequency); |
base::TimeDelta additional_delta = |
base::TimeDelta::FromMilliseconds(kAdditionalIncrement); |
testing_clock_.Advance(delta_increments_ + additional_delta); |