webrtc/modules/rtp_rtcp/source/rtcp_receiver_unittest.cc - Issue 2393723004: replace NtpTime->Clock with Clock->NtpTime dependency

Unified Diff: webrtc/modules/rtp_rtcp/source/rtcp_receiver_unittest.cc

Issue 2393723004: replace NtpTime->Clock with Clock->NtpTime dependency (Closed)

Patch Set: rebase Created 3 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

« no previous file with comments | « webrtc/modules/rtp_rtcp/source/rtcp_receiver.cc ('k') | webrtc/modules/rtp_rtcp/source/rtcp_sender.cc » ('j') | webrtc/system_wrappers/include/clock.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webrtc/modules/rtp_rtcp/source/rtcp_receiver_unittest.cc

diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_receiver_unittest.cc b/webrtc/modules/rtp_rtcp/source/rtcp_receiver_unittest.cc

index 1e3a7a23879511af8abaa7fff5cbf07511dce69e..bc3aca0d57f1e95a4c33959dd0319efa6a6cd9b7 100644

--- a/webrtc/modules/rtp_rtcp/source/rtcp_receiver_unittest.cc

+++ b/webrtc/modules/rtp_rtcp/source/rtcp_receiver_unittest.cc

@@ -271,7 +271,7 @@ TEST_F(RtcpReceiverTest, InjectSrPacketCalculatesRTT) {

EXPECT_EQ(

-1, rtcp_receiver_.RTT(kSenderSsrc, &rtt_ms, nullptr, nullptr, nullptr));

- uint32_t sent_ntp = CompactNtp(NtpTime(system_clock_));

+ uint32_t sent_ntp = CompactNtp(system_clock_.CurrentNtpTime());

system_clock_.AdvanceTimeMilliseconds(kRttMs + kDelayMs);

rtcp::SenderReport sr;

@@ -301,7 +301,7 @@ TEST_F(RtcpReceiverTest, InjectSrPacketCalculatesNegativeRTTAsOne) {

EXPECT_EQ(

-1, rtcp_receiver_.RTT(kSenderSsrc, &rtt_ms, nullptr, nullptr, nullptr));

- uint32_t sent_ntp = CompactNtp(NtpTime(system_clock_));

+ uint32_t sent_ntp = CompactNtp(system_clock_.CurrentNtpTime());

system_clock_.AdvanceTimeMilliseconds(kRttMs + kDelayMs);

rtcp::SenderReport sr;

@@ -774,7 +774,7 @@ TEST_F(RtcpReceiverTest, InjectExtendedReportsDlrrPacketWithSubBlock) {

InjectRtcpPacket(xr);

- uint32_t compact_ntp_now = CompactNtp(NtpTime(system_clock_));

+ uint32_t compact_ntp_now = CompactNtp(system_clock_.CurrentNtpTime());

EXPECT_TRUE(rtcp_receiver_.GetAndResetXrRrRtt(&rtt_ms));

uint32_t rtt_ntp = compact_ntp_now - kDelay - kLastRR;

EXPECT_NEAR(CompactNtpRttToMs(rtt_ntp), rtt_ms, 1);

@@ -793,7 +793,7 @@ TEST_F(RtcpReceiverTest, InjectExtendedReportsDlrrPacketWithMultipleSubBlocks) {

InjectRtcpPacket(xr);

- uint32_t compact_ntp_now = CompactNtp(NtpTime(system_clock_));

+ uint32_t compact_ntp_now = CompactNtp(system_clock_.CurrentNtpTime());

int64_t rtt_ms = 0;

EXPECT_TRUE(rtcp_receiver_.GetAndResetXrRrRtt(&rtt_ms));

uint32_t rtt_ntp = compact_ntp_now - kDelay - kLastRR;

@@ -859,7 +859,7 @@ TEST_F(RtcpReceiverTest, RttCalculatedAfterExtendedReportsDlrr) {

const uint32_t kDelayNtp = rand.Rand(0, 0x7fffffff);

const int64_t kDelayMs = CompactNtpRttToMs(kDelayNtp);

rtcp_receiver_.SetRtcpXrRrtrStatus(true);

- NtpTime now(system_clock_);

+ NtpTime now = system_clock_.CurrentNtpTime();

uint32_t sent_ntp = CompactNtp(now);

system_clock_.AdvanceTimeMilliseconds(kRttMs + kDelayMs);

@@ -879,7 +879,7 @@ TEST_F(RtcpReceiverTest, XrDlrrCalculatesNegativeRttAsOne) {

const int64_t kRttMs = rand.Rand(-3600 * 1000, -1);

const uint32_t kDelayNtp = rand.Rand(0, 0x7fffffff);

const int64_t kDelayMs = CompactNtpRttToMs(kDelayNtp);

- NtpTime now(system_clock_);

+ NtpTime now = system_clock_.CurrentNtpTime();

uint32_t sent_ntp = CompactNtp(now);

system_clock_.AdvanceTimeMilliseconds(kRttMs + kDelayMs);

rtcp_receiver_.SetRtcpXrRrtrStatus(true);

« no previous file with comments | « webrtc/modules/rtp_rtcp/source/rtcp_receiver.cc ('k') | webrtc/modules/rtp_rtcp/source/rtcp_sender.cc » ('j') | webrtc/system_wrappers/include/clock.h » ('J')