vpx_timer: increase resolution

There's no useful reason to limit this timer to 1 second.

Change-Id: Idd1960268624e8bdfe958d99833ae6482fdb423e
This commit is contained in:
John Koleszar 2012-03-01 12:49:43 -08:00
parent 9e50ed7f27
commit a6f538cefa

View File

@ -11,6 +11,7 @@
#ifndef VPX_TIMER_H #ifndef VPX_TIMER_H
#define VPX_TIMER_H #define VPX_TIMER_H
#include "vpx/vpx_integer.h"
#if CONFIG_OS_SUPPORT #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) vpx_usec_timer_elapsed(struct vpx_usec_timer *t)
{ {
#if defined(_WIN32) #if defined(_WIN32)
@ -83,15 +84,13 @@ vpx_usec_timer_elapsed(struct vpx_usec_timer *t)
diff.QuadPart = t->end.QuadPart - t->begin.QuadPart; diff.QuadPart = t->end.QuadPart - t->begin.QuadPart;
if (QueryPerformanceFrequency(&freq) && diff.QuadPart < freq.QuadPart) QueryPerformanceFrequency(&freq);
return (long)(diff.QuadPart * 1000000 / freq.QuadPart); return diff.QuadPart * 1000000 / freq.QuadPart;
return 1000000;
#else #else
struct timeval diff; struct timeval diff;
timersub(&t->end, &t->begin, &diff); timersub(&t->end, &t->begin, &diff);
return diff.tv_sec ? 1000000 : diff.tv_usec; return diff.tv_sec * 1000000 + diff.tv_usec;
#endif #endif
} }