diff options
| -rw-r--r-- | vpx_ports/vpx_timer.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/vpx_ports/vpx_timer.h b/vpx_ports/vpx_timer.h index c8335a0a8..d07e08610 100644 --- a/vpx_ports/vpx_timer.h +++ b/vpx_ports/vpx_timer.h @@ -11,6 +11,7 @@ #ifndef VPX_TIMER_H #define VPX_TIMER_H +#include "vpx/vpx_integer.h" #if CONFIG_OS_SUPPORT @@ -75,7 +76,7 @@ vpx_usec_timer_mark(struct vpx_usec_timer *t) } -static long +static int64_t vpx_usec_timer_elapsed(struct vpx_usec_timer *t) { #if defined(_WIN32) @@ -83,15 +84,13 @@ vpx_usec_timer_elapsed(struct vpx_usec_timer *t) diff.QuadPart = t->end.QuadPart - t->begin.QuadPart; - if (QueryPerformanceFrequency(&freq) && diff.QuadPart < freq.QuadPart) - return (long)(diff.QuadPart * 1000000 / freq.QuadPart); - - return 1000000; + QueryPerformanceFrequency(&freq); + return diff.QuadPart * 1000000 / freq.QuadPart; #else struct timeval diff; timersub(&t->end, &t->begin, &diff); - return diff.tv_sec ? 1000000 : diff.tv_usec; + return diff.tv_sec * 1000000 + diff.tv_usec; #endif } |