Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(315)

Side by Side Diff: webrtc/system_wrappers/include/ntp_time.h

Issue 2393723004: replace NtpTime->Clock with Clock->NtpTime dependency (Closed)
Patch Set: . 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 unified diff | Download patch
« no previous file with comments | « webrtc/system_wrappers/include/clock.h ('k') | webrtc/system_wrappers/source/clock.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 #ifndef WEBRTC_SYSTEM_WRAPPERS_INCLUDE_NTP_TIME_H_ 10 #ifndef WEBRTC_SYSTEM_WRAPPERS_INCLUDE_NTP_TIME_H_
11 #define WEBRTC_SYSTEM_WRAPPERS_INCLUDE_NTP_TIME_H_ 11 #define WEBRTC_SYSTEM_WRAPPERS_INCLUDE_NTP_TIME_H_
12 12
13 #include <stdint.h> 13 #include <stdint.h>
14 14
15 #include "webrtc/system_wrappers/include/clock.h"
16
17 namespace webrtc { 15 namespace webrtc {
18 16
19 class NtpTime { 17 class NtpTime {
20 public: 18 public:
21 NtpTime() : seconds_(0), fractions_(0) {} 19 NtpTime() : seconds_(0), fractions_(0) {}
22 explicit NtpTime(const Clock& clock) {
23 clock.CurrentNtp(seconds_, fractions_);
24 }
25 NtpTime(uint32_t seconds, uint32_t fractions) 20 NtpTime(uint32_t seconds, uint32_t fractions)
26 : seconds_(seconds), fractions_(fractions) {} 21 : seconds_(seconds), fractions_(fractions) {}
27 22
28 NtpTime(const NtpTime&) = default; 23 NtpTime(const NtpTime&) = default;
29 NtpTime& operator=(const NtpTime&) = default; 24 NtpTime& operator=(const NtpTime&) = default;
30 25
31 void SetCurrent(const Clock& clock) {
32 clock.CurrentNtp(seconds_, fractions_);
33 }
34 void Set(uint32_t seconds, uint32_t fractions) { 26 void Set(uint32_t seconds, uint32_t fractions) {
35 seconds_ = seconds; 27 seconds_ = seconds;
36 fractions_ = fractions; 28 fractions_ = fractions;
37 } 29 }
38 void Reset() { 30 void Reset() {
39 seconds_ = 0; 31 seconds_ = 0;
40 fractions_ = 0; 32 fractions_ = 0;
41 } 33 }
42 34
43 int64_t ToMs() const { return Clock::NtpToMs(seconds_, fractions_); } 35 int64_t ToMs() const {
44 36 static constexpr double kNtpFracPerMs = 4.294967296E6; // 2^32 / 1000.
37 const double frac_ms = static_cast<double>(fractions_) / kNtpFracPerMs;
38 return 1000 * static_cast<int64_t>(seconds_) +
39 static_cast<int64_t>(frac_ms + 0.5);
40 }
45 // NTP standard (RFC1305, section 3.1) explicitly state value 0/0 is invalid. 41 // NTP standard (RFC1305, section 3.1) explicitly state value 0/0 is invalid.
46 bool Valid() const { return !(seconds_ == 0 && fractions_ == 0); } 42 bool Valid() const { return !(seconds_ == 0 && fractions_ == 0); }
47 43
48 uint32_t seconds() const { return seconds_; } 44 uint32_t seconds() const { return seconds_; }
49 uint32_t fractions() const { return fractions_; } 45 uint32_t fractions() const { return fractions_; }
50 46
51 private: 47 private:
52 uint32_t seconds_; 48 uint32_t seconds_;
53 uint32_t fractions_; 49 uint32_t fractions_;
54 }; 50 };
55 51
56 inline bool operator==(const NtpTime& n1, const NtpTime& n2) { 52 inline bool operator==(const NtpTime& n1, const NtpTime& n2) {
57 return n1.seconds() == n2.seconds() && n1.fractions() == n2.fractions(); 53 return n1.seconds() == n2.seconds() && n1.fractions() == n2.fractions();
58 } 54 }
59 inline bool operator!=(const NtpTime& n1, const NtpTime& n2) { 55 inline bool operator!=(const NtpTime& n1, const NtpTime& n2) {
60 return !(n1 == n2); 56 return !(n1 == n2);
61 } 57 }
62 58
63 } // namespace webrtc 59 } // namespace webrtc
64 #endif // WEBRTC_SYSTEM_WRAPPERS_INCLUDE_NTP_TIME_H_ 60 #endif // WEBRTC_SYSTEM_WRAPPERS_INCLUDE_NTP_TIME_H_
OLDNEW
« no previous file with comments | « webrtc/system_wrappers/include/clock.h ('k') | webrtc/system_wrappers/source/clock.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698