rtt calculation handles time go backwards

webrtc/modules/rtp_rtcp/source/time_util.h

Index: webrtc/modules/rtp_rtcp/source/time_util.h
diff --git a/webrtc/modules/rtp_rtcp/source/time_util.h b/webrtc/modules/rtp_rtcp/source/time_util.h
index a876b14d56f35c1eb11dd8b352287cf15bcdf134..2de82e4e49813c611191c99a706ed00c59362600 100644
--- a/webrtc/modules/rtp_rtcp/source/time_util.h
+++ b/webrtc/modules/rtp_rtcp/source/time_util.h
@@ -39,11 +39,9 @@ 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 upto ~18.2 hours (2^16 seconds).
-inline uint32_t CompactNtpIntervalToMs(uint32_t compact_ntp_interval) {
-  uint64_t value = static_cast<uint64_t>(compact_ntp_interval);
-  return (value * 1000 + (1 << 15)) >> 16;
-}
+// This interval can be upto ~9.1 hours (2^15 seconds).

[stefan-webrtc, 2016/03/04 14:07:33]

up to

[danilchap, 2016/03/04 15:05:50]

Done.

+// 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_