zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace Clock::CurrentNtp with Clock::CurrentNtpTime

Browse Source 
CurrentNtp return time by taking two output parameters by reference
(also breaks style guide)
CurrentNtpTime treat ntp time as single entity and returns it using NtpTime structure.
(making interface clearer)

BUG=None

Review-Url: https://codereview.webrtc.org/2733823002
Cr-Commit-Position: refs/heads/master@{#17088}
This commit is contained in:
danilchap
2017-03-07 02:51:09 -08:00
committed by Commit bot
parent 92a7a1810c
commit 21dc1890f4
6 changed files with 24 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
webrtc/modules/rtp_rtcp/source/remote_ntp_time_estimator_unittest.cc
View File

@ -46,12 +46,10 @@ class RemoteNtpTimeEstimatorTest : public ::testing::Test {
void SendRtcpSr() {
uint32_t rtcp_timestamp = GetRemoteTimestamp();
uint32_t ntp_seconds;
uint32_t ntp_fractions;
remote_clock_.CurrentNtp(ntp_seconds, ntp_fractions);
NtpTime ntp = remote_clock_.CurrentNtpTime();
AdvanceTimeMilliseconds(kTestRtt / 2);
ReceiveRtcpSr(kTestRtt, rtcp_timestamp, ntp_seconds, ntp_fractions);
ReceiveRtcpSr(kTestRtt, rtcp_timestamp, ntp.seconds(), ntp.fractions());
}
void UpdateRtcpTimestamp(int64_t rtt, uint32_t ntp_secs, uint32_t ntp_frac,

14
webrtc/modules/rtp_rtcp/source/rtcp_sender_unittest.cc
View File

@ -295,14 +295,11 @@ TEST_F(RtcpSenderTest, SendSr) {
rtcp_sender_->SetSendingStatus(feedback_state, true);
feedback_state.packets_sent = kPacketCount;
feedback_state.media_bytes_sent = kOctetCount;
uint32_t ntp_secs;
uint32_t ntp_frac;
clock_.CurrentNtp(ntp_secs, ntp_frac);
NtpTime ntp = clock_.CurrentNtpTime();
EXPECT_EQ(0, rtcp_sender_->SendRTCP(feedback_state, kRtcpSr));
EXPECT_EQ(1, parser()->sender_report()->num_packets());
EXPECT_EQ(kSenderSsrc, parser()->sender_report()->sender_ssrc());
EXPECT_EQ(ntp_secs, parser()->sender_report()->ntp().seconds());
EXPECT_EQ(ntp_frac, parser()->sender_report()->ntp().fractions());
EXPECT_EQ(ntp, parser()->sender_report()->ntp());
EXPECT_EQ(kPacketCount, parser()->sender_report()->sender_packet_count());
EXPECT_EQ(kOctetCount, parser()->sender_report()->sender_octet_count());
EXPECT_EQ(kStartRtpTimestamp + kRtpTimestamp,
@ -640,17 +637,14 @@ TEST_F(RtcpSenderTest, SendXrWithRrtr) {
rtcp_sender_->SetRTCPStatus(RtcpMode::kCompound);
EXPECT_EQ(0, rtcp_sender_->SetSendingStatus(feedback_state(), false));
rtcp_sender_->SendRtcpXrReceiverReferenceTime(true);
uint32_t ntp_secs;
uint32_t ntp_frac;
clock_.CurrentNtp(ntp_secs, ntp_frac);
NtpTime ntp = clock_.CurrentNtpTime();
EXPECT_EQ(0, rtcp_sender_->SendRTCP(feedback_state(), kRtcpReport));
EXPECT_EQ(1, parser()->xr()->num_packets());
EXPECT_EQ(kSenderSsrc, parser()->xr()->sender_ssrc());
EXPECT_FALSE(parser()->xr()->dlrr());
EXPECT_FALSE(parser()->xr()->voip_metric());
ASSERT_TRUE(parser()->xr()->rrtr());
EXPECT_EQ(ntp_secs, parser()->xr()->rrtr()->ntp().seconds());
EXPECT_EQ(ntp_frac, parser()->xr()->rrtr()->ntp().fractions());
EXPECT_EQ(ntp, parser()->xr()->rrtr()->ntp());
}
TEST_F(RtcpSenderTest, TestNoXrRrtrSentIfSending) {