admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change NtpTime representation to single uint64_t

Browse Source 
Add explicit conversions to/from uint64_t

uint64_t is natural type for NtpTime, including wrap on overflow.

BUG=None

Review-Url: https://codereview.webrtc.org/2695683002
Cr-Commit-Position: refs/heads/master@{#16624}
This commit is contained in:
danilchap 2017-02-15 01:18:15 -08:00 committed by Commit bot
parent 6486ef50ac
commit 27260ced9f
2 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
webrtc/system_wrappers/include/ntp_time.h
View File

@ -16,41 +16,39 @@ namespace webrtc {
class NtpTime {
public:
NtpTime() : seconds_(0), fractions_(0) {}
static constexpr uint64_t kFractionsPerSecond = 0x100000000;
NtpTime() : value_(0) {}
explicit NtpTime(uint64_t value) : value_(value) {}
NtpTime(uint32_t seconds, uint32_t fractions)
: seconds_(seconds), fractions_(fractions) {}
: value_(seconds * kFractionsPerSecond + fractions) {}
NtpTime(const NtpTime&) = default;
NtpTime& operator=(const NtpTime&) = default;
explicit operator uint64_t() const { return value_; }
void Set(uint32_t seconds, uint32_t fractions) {
seconds_ = seconds;
fractions_ = fractions;
}
void Reset() {
seconds_ = 0;
fractions_ = 0;
value_ = seconds * kFractionsPerSecond + fractions;
}
void Reset() { value_ = 0; }
int64_t ToMs() const {
static constexpr double kNtpFracPerMs = 4.294967296E6; // 2^32 / 1000.
const double frac_ms = static_cast<double>(fractions_) / kNtpFracPerMs;
return 1000 * static_cast<int64_t>(seconds_) +
const double frac_ms = static_cast<double>(fractions()) / kNtpFracPerMs;
return 1000 * static_cast<int64_t>(seconds()) +
static_cast<int64_t>(frac_ms + 0.5);
}
// NTP standard (RFC1305, section 3.1) explicitly state value 0/0 is invalid.
bool Valid() const { return !(seconds_ == 0 && fractions_ == 0); }
// NTP standard (RFC1305, section 3.1) explicitly state value 0 is invalid.
bool Valid() const { return value_ != 0; }
uint32_t seconds() const { return seconds_; }
uint32_t fractions() const { return fractions_; }
uint32_t seconds() const { return value_ / kFractionsPerSecond; }
uint32_t fractions() const { return value_ % kFractionsPerSecond; }
private:
uint32_t seconds_;
uint32_t fractions_;
uint64_t value_;
};
inline bool operator==(const NtpTime& n1, const NtpTime& n2) {
return n1.seconds() == n2.seconds() && n1.fractions() == n2.fractions();
return static_cast<uint64_t>(n1) == static_cast<uint64_t>(n2);
}
inline bool operator!=(const NtpTime& n1, const NtpTime& n2) {
return !(n1 == n2);

7
webrtc/system_wrappers/source/ntp_time_unittest.cc
View File

@ -54,5 +54,12 @@ TEST(NtpTimeTest, ToMsMeansToNtpMilliseconds) {
EXPECT_EQ(ntp.ToMs(), clock.CurrentNtpInMilliseconds());
}
TEST(NtpTimeTest, CanExplicitlyConvertToAndFromUint64) {
uint64_t untyped_time = 0x123456789;
NtpTime time(untyped_time);
EXPECT_EQ(untyped_time, static_cast<uint64_t>(time));
EXPECT_EQ(NtpTime(0x12345678, 0x90abcdef), NtpTime(0x1234567890abcdef));
}
} // namespace
} // namespace webrtc