Index: webrtc/base/timeutils.cc |
diff --git a/webrtc/base/timeutils.cc b/webrtc/base/timeutils.cc |
index 0c40c5286ea43d0b209c0c54179ed52de9c5871e..5776982df3c9be8432b1b4586b2054293a8b98a5 100644 |
--- a/webrtc/base/timeutils.cc |
+++ b/webrtc/base/timeutils.cc |
@@ -32,8 +32,6 @@ |
namespace rtc { |
-const uint32_t HALF = 0x80000000; |
- |
uint64_t TimeNanos() { |
int64_t ticks = 0; |
#if defined(WEBRTC_MAC) |
@@ -141,61 +139,11 @@ void CurrentTmTime(struct tm *tm, int *microseconds) { |
*microseconds = timeval.tv_usec; |
} |
-uint32_t TimeAfter(int32_t elapsed) { |
+int64_t TimeAfter(int elapsed) { |
RTC_DCHECK_GE(elapsed, 0); |
- RTC_DCHECK_LT(static_cast<uint32_t>(elapsed), HALF); |
return Time() + elapsed; |
} |
-bool TimeIsBetween(uint32_t earlier, uint32_t middle, uint32_t later) { |
- if (earlier <= later) { |
- return ((earlier <= middle) && (middle <= later)); |
- } else { |
- return !((later < middle) && (middle < earlier)); |
- } |
-} |
- |
-bool TimeIsLaterOrEqual(uint32_t earlier, uint32_t later) { |
-#if EFFICIENT_IMPLEMENTATION |
- int32_t diff = later - earlier; |
- return (diff >= 0 && static_cast<uint32_t>(diff) < HALF); |
-#else |
- const bool later_or_equal = TimeIsBetween(earlier, later, earlier + HALF); |
- return later_or_equal; |
-#endif |
-} |
- |
-bool TimeIsLater(uint32_t earlier, uint32_t later) { |
-#if EFFICIENT_IMPLEMENTATION |
- int32_t diff = later - earlier; |
- return (diff > 0 && static_cast<uint32_t>(diff) < HALF); |
-#else |
- const bool earlier_or_equal = TimeIsBetween(later, earlier, later + HALF); |
- return !earlier_or_equal; |
-#endif |
-} |
- |
-int32_t TimeDiff(uint32_t later, uint32_t earlier) { |
-#if EFFICIENT_IMPLEMENTATION |
- return later - earlier; |
-#else |
- const bool later_or_equal = TimeIsBetween(earlier, later, earlier + HALF); |
- if (later_or_equal) { |
- if (earlier <= later) { |
- return static_cast<long>(later - earlier); |
- } else { |
- return static_cast<long>(later + (UINT32_MAX - earlier) + 1); |
- } |
- } else { |
- if (later <= earlier) { |
- return -static_cast<long>(earlier - later); |
- } else { |
- return -static_cast<long>(earlier + (UINT32_MAX - later) + 1); |
- } |
- } |
-#endif |
-} |
- |
int64_t TimeDiff64(int64_t later, int64_t earlier) { |
return later - earlier; |
} |