c7c26a0e64
Reason for revert: Doing a reland where systeminfo.cc includes basictypes.h so that CPU_X86 etc. are defined when they are checked/used. Original issue's description: > Revert of Replace basictypes.h with stdint.h for int_t types. (patchset #1 id:1 of https://codereview.webrtc.org/2604043002/ ) > > Reason for revert: > Very likely cause of Chromium import bot breakage (unused function '__cpuid'), TBD why. > > Original issue's description: > > Replace basictypes.h with stdint.h for int_t types. > > > > Removes basictypes.h for types that only makes use of it for fixed-size-int > > typedefs and replaces it with stdint.h. > > > > BUG=webrtc:6853 > > R=tommi@webrtc.org > > > > Review-Url: https://codereview.webrtc.org/2604043002 > > Cr-Commit-Position: refs/heads/master@{#15867} > > Committed:7fd1a75300> > TBR=tommi@webrtc.org > # Skipping CQ checks because original CL landed less than 1 days ago. > NOPRESUBMIT=true > NOTREECHECKS=true > NOTRY=true > BUG=webrtc:6853 > > Review-Url: https://codereview.webrtc.org/2603203003 > Cr-Commit-Position: refs/heads/master@{#15869} > Committed:7eb0e23bcfBUG=webrtc:6853 TBR=tommi@webrtc.org Review-Url: https://codereview.webrtc.org/2609783002 Cr-Commit-Position: refs/heads/master@{#15873}
49 lines
1.8 KiB
C++
49 lines
1.8 KiB
C++
/*
|
|
* Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_TIME_UTIL_H_
|
|
#define WEBRTC_MODULES_RTP_RTCP_SOURCE_TIME_UTIL_H_
|
|
|
|
#include <stdint.h>
|
|
|
|
#include "webrtc/system_wrappers/include/ntp_time.h"
|
|
|
|
namespace webrtc {
|
|
|
|
// Converts NTP timestamp to RTP timestamp.
|
|
inline uint32_t NtpToRtp(NtpTime ntp, uint32_t freq) {
|
|
uint32_t tmp = (static_cast<uint64_t>(ntp.fractions()) * freq) >> 32;
|
|
return ntp.seconds() * freq + tmp;
|
|
}
|
|
// Return the current RTP timestamp from the NTP timestamp
|
|
// returned by the specified clock.
|
|
inline uint32_t CurrentRtp(const Clock& clock, uint32_t freq) {
|
|
return NtpToRtp(NtpTime(clock), freq);
|
|
}
|
|
|
|
// Helper function for compact ntp representation:
|
|
// RFC 3550, Section 4. Time Format.
|
|
// Wallclock time is represented using the timestamp format of
|
|
// the Network Time Protocol (NTP).
|
|
// ...
|
|
// In some fields where a more compact representation is
|
|
// appropriate, only the middle 32 bits are used; that is, the low 16
|
|
// bits of the integer part and the high 16 bits of the fractional part.
|
|
inline uint32_t CompactNtp(NtpTime ntp) {
|
|
return (ntp.seconds() << 16) | (ntp.fractions() >> 16);
|
|
}
|
|
// Converts interval between compact ntp timestamps to milliseconds.
|
|
// This interval can be up to ~9.1 hours (2^15 seconds).
|
|
// Values close to 2^16 seconds consider negative and result in minimum rtt = 1.
|
|
int64_t CompactNtpRttToMs(uint32_t compact_ntp_interval);
|
|
|
|
} // namespace webrtc
|
|
#endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_TIME_UTIL_H_
|