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

Side by Side Diff: webrtc/base/timeutils.cc

Issue 2514553003: Change rtc::TimeNanos and rtc::TimeMicros return value from uint64_t to int64_t. (Closed)
Patch Set: Rebased, on top of fixed BoringSSL TimeCallback.' Created 4 years 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/base/timeutils.h ('k') | webrtc/base/timeutils_unittest.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 2004 The WebRTC Project Authors. All rights reserved. 2 * Copyright 2004 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
(...skipping 21 matching lines...) Expand all
32 namespace rtc { 32 namespace rtc {
33 33
34 ClockInterface* g_clock = nullptr; 34 ClockInterface* g_clock = nullptr;
35 35
36 ClockInterface* SetClockForTesting(ClockInterface* clock) { 36 ClockInterface* SetClockForTesting(ClockInterface* clock) {
37 ClockInterface* prev = g_clock; 37 ClockInterface* prev = g_clock;
38 g_clock = clock; 38 g_clock = clock;
39 return prev; 39 return prev;
40 } 40 }
41 41
42 uint64_t SystemTimeNanos() { 42 int64_t SystemTimeNanos() {
43 int64_t ticks; 43 int64_t ticks;
44 #if defined(WEBRTC_MAC) 44 #if defined(WEBRTC_MAC)
45 static mach_timebase_info_data_t timebase; 45 static mach_timebase_info_data_t timebase;
46 if (timebase.denom == 0) { 46 if (timebase.denom == 0) {
47 // Get the timebase if this is the first time we run. 47 // Get the timebase if this is the first time we run.
48 // Recommended by Apple's QA1398. 48 // Recommended by Apple's QA1398.
49 if (mach_timebase_info(&timebase) != KERN_SUCCESS) { 49 if (mach_timebase_info(&timebase) != KERN_SUCCESS) {
50 RTC_DCHECK(false); 50 RTC_DCHECK(false);
51 } 51 }
52 } 52 }
(...skipping 28 matching lines...) Expand all
81 #else 81 #else
82 #error Unsupported platform. 82 #error Unsupported platform.
83 #endif 83 #endif
84 return ticks; 84 return ticks;
85 } 85 }
86 86
87 int64_t SystemTimeMillis() { 87 int64_t SystemTimeMillis() {
88 return static_cast<int64_t>(SystemTimeNanos() / kNumNanosecsPerMillisec); 88 return static_cast<int64_t>(SystemTimeNanos() / kNumNanosecsPerMillisec);
89 } 89 }
90 90
91 uint64_t TimeNanos() { 91 int64_t TimeNanos() {
92 if (g_clock) { 92 if (g_clock) {
93 return g_clock->TimeNanos(); 93 return g_clock->TimeNanos();
94 } 94 }
95 return SystemTimeNanos(); 95 return SystemTimeNanos();
96 } 96 }
97 97
98 uint32_t Time32() { 98 uint32_t Time32() {
99 return static_cast<uint32_t>(TimeNanos() / kNumNanosecsPerMillisec); 99 return static_cast<uint32_t>(TimeNanos() / kNumNanosecsPerMillisec);
100 } 100 }
101 101
102 int64_t TimeMillis() { 102 int64_t TimeMillis() {
103 return static_cast<int64_t>(TimeNanos() / kNumNanosecsPerMillisec); 103 return TimeNanos() / kNumNanosecsPerMillisec;
104 } 104 }
105 105
106 uint64_t TimeMicros() { 106 int64_t TimeMicros() {
107 return static_cast<uint64_t>(TimeNanos() / kNumNanosecsPerMicrosec); 107 return TimeNanos() / kNumNanosecsPerMicrosec;
108 } 108 }
109 109
110 int64_t TimeAfter(int64_t elapsed) { 110 int64_t TimeAfter(int64_t elapsed) {
111 RTC_DCHECK_GE(elapsed, 0); 111 RTC_DCHECK_GE(elapsed, 0);
112 return TimeMillis() + elapsed; 112 return TimeMillis() + elapsed;
113 } 113 }
114 114
115 int32_t TimeDiff32(uint32_t later, uint32_t earlier) { 115 int32_t TimeDiff32(uint32_t later, uint32_t earlier) {
116 return later - earlier; 116 return later - earlier;
117 } 117 }
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
197 #elif defined(WEBRTC_WIN) 197 #elif defined(WEBRTC_WIN)
198 struct _timeb time; 198 struct _timeb time;
199 _ftime(&time); 199 _ftime(&time);
200 // Convert from second (1.0) and milliseconds (1e-3). 200 // Convert from second (1.0) and milliseconds (1e-3).
201 return (static_cast<int64_t>(time.time) * rtc::kNumMicrosecsPerSec + 201 return (static_cast<int64_t>(time.time) * rtc::kNumMicrosecsPerSec +
202 static_cast<int64_t>(time.millitm) * rtc::kNumMicrosecsPerMillisec); 202 static_cast<int64_t>(time.millitm) * rtc::kNumMicrosecsPerMillisec);
203 #endif 203 #endif
204 } 204 }
205 205
206 } // namespace rtc 206 } // namespace rtc
OLDNEW
« no previous file with comments | « webrtc/base/timeutils.h ('k') | webrtc/base/timeutils_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698