| Index: media/cast/rtcp/rtcp_unittest.cc
|
| diff --git a/media/cast/rtcp/rtcp_unittest.cc b/media/cast/rtcp/rtcp_unittest.cc
|
| index a4213ff60537879f64cfa789a9f7feae608d36e6..613c6fd3146a62c752b43331c054a029ef27dc02 100644
|
| --- a/media/cast/rtcp/rtcp_unittest.cc
|
| +++ b/media/cast/rtcp/rtcp_unittest.cc
|
| @@ -298,22 +298,13 @@ TEST_F(RtcpTest, Rtt) {
|
| }
|
|
|
| TEST_F(RtcpTest, NtpAndTime) {
|
| - RtcpPeer rtcp_peer(&testing_clock_,
|
| - &mock_sender_feedback_,
|
| - NULL,
|
| - NULL,
|
| - NULL,
|
| - kRtcpReducedSize,
|
| - base::TimeDelta::FromMilliseconds(kRtcpIntervalMs),
|
| - false,
|
| - kReceiverSsrc,
|
| - kCName);
|
| uint32 ntp_seconds = 0;
|
| uint32 ntp_fractions = 0;
|
| - base::TimeTicks input_time = base::TimeTicks::FromInternalValue(
|
| - 12345678901000LL + kNtpEpochDeltaMicroseconds);
|
| - ConvertTimeToNtp(input_time, &ntp_seconds, &ntp_fractions);
|
| + uint64 input_time_us = 12345678901000LL;
|
| + ConvertTimeToFractions(input_time_us, &ntp_seconds, &ntp_fractions);
|
| EXPECT_EQ(12345678u, ntp_seconds);
|
| + base::TimeTicks input_time = base::TimeTicks::FromInternalValue(
|
| + input_time_us);
|
| EXPECT_EQ(input_time,
|
| ConvertNtpToTime(ntp_seconds, ntp_fractions));
|
| }
|
| @@ -367,11 +358,12 @@ TEST_F(RtcpTest, RtpTimestampInSenderTime) {
|
|
|
| uint32 ntp_seconds = 0;
|
| uint32 ntp_fractions = 0;
|
| + uint64 input_time_us = 12345678901000LL;
|
| base::TimeTicks input_time = base::TimeTicks::FromInternalValue(
|
| - 12345678901000LL + kNtpEpochDeltaMicroseconds);
|
| + input_time_us);
|
|
|
| // Test exact match.
|
| - ConvertTimeToNtp(input_time, &ntp_seconds, &ntp_fractions);
|
| + ConvertTimeToFractions(input_time_us, &ntp_seconds, &ntp_fractions);
|
| rtcp_peer.OnReceivedLipSyncInfo(rtp_timestamp, ntp_seconds, ntp_fractions);
|
| EXPECT_TRUE(rtcp_peer.RtpTimestampInSenderTime(frequency, rtp_timestamp,
|
| &rtp_timestamp_in_ticks));
|
|
|