OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2012 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 | 10 |
11 #ifndef SYSTEM_WRAPPERS_INCLUDE_RTP_TO_NTP_H_ | 11 #ifndef SYSTEM_WRAPPERS_INCLUDE_RTP_TO_NTP_H_ |
12 #define SYSTEM_WRAPPERS_INCLUDE_RTP_TO_NTP_H_ | 12 #define SYSTEM_WRAPPERS_INCLUDE_RTP_TO_NTP_H_ |
13 | 13 |
14 #include <list> | 14 #include <list> |
15 | 15 |
| 16 #include "webrtc/system_wrappers/include/ntp_time.h" |
16 #include "webrtc/typedefs.h" | 17 #include "webrtc/typedefs.h" |
17 | 18 |
18 namespace webrtc { | 19 namespace webrtc { |
19 | 20 |
20 struct RtcpMeasurement { | 21 struct RtcpMeasurement { |
21 RtcpMeasurement(); | 22 RtcpMeasurement(); |
22 RtcpMeasurement(uint32_t ntp_secs, uint32_t ntp_frac, uint32_t timestamp); | 23 RtcpMeasurement(uint32_t ntp_secs, uint32_t ntp_frac, uint32_t timestamp); |
23 bool IsEqual(const RtcpMeasurement& other) const; | 24 bool IsEqual(const RtcpMeasurement& other) const; |
24 | 25 |
25 uint32_t ntp_secs; | 26 NtpTime ntp_time; |
26 uint32_t ntp_frac; | |
27 uint32_t rtp_timestamp; | 27 uint32_t rtp_timestamp; |
28 }; | 28 }; |
29 | 29 |
30 struct RtcpMeasurements { | 30 struct RtcpMeasurements { |
31 RtcpMeasurements(); | 31 RtcpMeasurements(); |
32 ~RtcpMeasurements(); | 32 ~RtcpMeasurements(); |
33 bool Contains(const RtcpMeasurement& other) const; | 33 bool Contains(const RtcpMeasurement& other) const; |
34 bool IsValid(const RtcpMeasurement& other) const; | 34 bool IsValid(const RtcpMeasurement& other) const; |
35 void UpdateParameters(); | 35 void UpdateParameters(); |
36 | 36 |
(...skipping 25 matching lines...) Expand all Loading... |
62 const RtcpMeasurements& rtcp_measurements, | 62 const RtcpMeasurements& rtcp_measurements, |
63 int64_t* rtp_timestamp_in_ms); | 63 int64_t* rtp_timestamp_in_ms); |
64 | 64 |
65 // Returns 1 there has been a forward wrap around, 0 if there has been no wrap | 65 // Returns 1 there has been a forward wrap around, 0 if there has been no wrap |
66 // around and -1 if there has been a backwards wrap around (i.e. reordering). | 66 // around and -1 if there has been a backwards wrap around (i.e. reordering). |
67 int CheckForWrapArounds(uint32_t rtp_timestamp, uint32_t rtcp_rtp_timestamp); | 67 int CheckForWrapArounds(uint32_t rtp_timestamp, uint32_t rtcp_rtp_timestamp); |
68 | 68 |
69 } // namespace webrtc | 69 } // namespace webrtc |
70 | 70 |
71 #endif // SYSTEM_WRAPPERS_INCLUDE_RTP_TO_NTP_H_ | 71 #endif // SYSTEM_WRAPPERS_INCLUDE_RTP_TO_NTP_H_ |
OLD | NEW |