Index: media/cast/net/rtcp/rtcp_builder_unittest.cc |
diff --git a/media/cast/net/rtcp/rtcp_builder_unittest.cc b/media/cast/net/rtcp/rtcp_builder_unittest.cc |
index f39c82db240f66046603bc0c67997acb79b32c2e..2c1accb8aa155b7c5eb0159b95c49127808a3c03 100644 |
--- a/media/cast/net/rtcp/rtcp_builder_unittest.cc |
+++ b/media/cast/net/rtcp/rtcp_builder_unittest.cc |
@@ -214,7 +214,7 @@ TEST_F(RtcpBuilderTest, RtcpReceiverReportWithRrtrCastMessageAndLog) { |
p.AddReceiverEventLog(kLostPacketId1, PACKET_RECEIVED, kTimeDelayMs); |
FrameEvent frame_event; |
- frame_event.rtp_timestamp = kRtpTimestamp; |
+ frame_event.rtp_timestamp = RtpTimeTicks().Expand(kRtpTimestamp); |
frame_event.type = FRAME_ACK_SENT; |
frame_event.media_type = VIDEO_EVENT; |
frame_event.timestamp = testing_clock.NowTicks(); |
@@ -222,7 +222,7 @@ TEST_F(RtcpBuilderTest, RtcpReceiverReportWithRrtrCastMessageAndLog) { |
testing_clock.Advance(base::TimeDelta::FromMilliseconds(kTimeDelayMs)); |
PacketEvent packet_event; |
- packet_event.rtp_timestamp = kRtpTimestamp; |
+ packet_event.rtp_timestamp = RtpTimeTicks().Expand(kRtpTimestamp); |
Irfan
2015/12/09 21:24:28
consider making kRtpTimestamp a RtpTimeTicks value
miu
2015/12/10 00:38:37
Done.
|
packet_event.type = PACKET_RECEIVED; |
packet_event.media_type = VIDEO_EVENT; |
packet_event.timestamp = testing_clock.NowTicks(); |
@@ -275,7 +275,8 @@ TEST_F(RtcpBuilderTest, RtcpReceiverReportWithOversizedFrameLog) { |
for (size_t i = 0; i < kRtcpMaxReceiverLogMessages; ++i) { |
PacketEvent packet_event; |
- packet_event.rtp_timestamp = kRtpTimestamp + 2345; |
+ packet_event.rtp_timestamp = |
+ RtpTimeTicks().Expand(kRtpTimestamp) + RtpTimeDelta::FromTicks(2345); |
packet_event.type = PACKET_RECEIVED; |
packet_event.media_type = VIDEO_EVENT; |
packet_event.timestamp = testing_clock.NowTicks(); |
@@ -322,7 +323,8 @@ TEST_F(RtcpBuilderTest, RtcpReceiverReportWithTooManyLogFrames) { |
for (size_t i = 0; i < kRtcpMaxReceiverLogMessages; ++i) { |
FrameEvent frame_event; |
- frame_event.rtp_timestamp = kRtpTimestamp + static_cast<int>(i); |
+ frame_event.rtp_timestamp = |
+ RtpTimeTicks().Expand(kRtpTimestamp) + RtpTimeDelta::FromTicks(i); |
frame_event.type = FRAME_ACK_SENT; |
frame_event.media_type = VIDEO_EVENT; |
frame_event.timestamp = testing_clock.NowTicks(); |
@@ -368,7 +370,7 @@ TEST_F(RtcpBuilderTest, RtcpReceiverReportWithOldLogFrames) { |
ReceiverRtcpEventSubscriber event_subscriber(500, VIDEO_EVENT); |
for (int i = 0; i < 11; ++i) { |
FrameEvent frame_event; |
- frame_event.rtp_timestamp = kRtpTimestamp; |
+ frame_event.rtp_timestamp = RtpTimeTicks().Expand(kRtpTimestamp); |
frame_event.type = FRAME_ACK_SENT; |
frame_event.media_type = VIDEO_EVENT; |
frame_event.timestamp = testing_clock.NowTicks(); |
@@ -419,7 +421,7 @@ TEST_F(RtcpBuilderTest, RtcpReceiverReportRedundancy) { |
} |
FrameEvent frame_event; |
- frame_event.rtp_timestamp = kRtpTimestamp; |
+ frame_event.rtp_timestamp = RtpTimeTicks().Expand(kRtpTimestamp); |
frame_event.type = FRAME_ACK_SENT; |
frame_event.media_type = VIDEO_EVENT; |
frame_event.timestamp = testing_clock.NowTicks(); |
@@ -446,7 +448,7 @@ TEST_F(RtcpBuilderTest, RtcpSenderReport) { |
RtcpSenderInfo sender_info; |
sender_info.ntp_seconds = kNtpHigh; |
sender_info.ntp_fraction = kNtpLow; |
- sender_info.rtp_timestamp = kRtpTimestamp; |
+ sender_info.rtp_timestamp = RtpTimeTicks().Expand(kRtpTimestamp); |
sender_info.send_packet_count = kSendPacketCount; |
sender_info.send_octet_count = kSendOctetCount; |