Commit 4159f702 authored by Michael Niedermayer's avatar Michael Niedermayer

avutil/timer: Fix units for x86 after c708b540

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent c2923100
...@@ -56,6 +56,10 @@ ...@@ -56,6 +56,10 @@
# endif # endif
#endif #endif
#ifndef FF_TIMER_UNITS
# define FF_TIMER_UNITS "UNITS"
#endif
#ifdef AV_READ_TIME #ifdef AV_READ_TIME
#define START_TIMER \ #define START_TIMER \
uint64_t tend; \ uint64_t tend; \
...@@ -76,7 +80,7 @@ ...@@ -76,7 +80,7 @@
tskip_count++; \ tskip_count++; \
if (((tcount + tskip_count) & (tcount + tskip_count - 1)) == 0) { \ if (((tcount + tskip_count) & (tcount + tskip_count - 1)) == 0) { \
av_log(NULL, AV_LOG_ERROR, \ av_log(NULL, AV_LOG_ERROR, \
"%"PRIu64" UNITS in %s, %d runs, %d skips\n", \ "%"PRIu64" " FF_TIMER_UNITS " in %s, %d runs, %d skips\n", \
tsum * 10 / tcount, id, tcount, tskip_count); \ tsum * 10 / tcount, id, tcount, tskip_count); \
} \ } \
} }
......
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
#if HAVE_INLINE_ASM #if HAVE_INLINE_ASM
#define FF_TIMER_UNITS "decicycles"
#define AV_READ_TIME read_time #define AV_READ_TIME read_time
static inline uint64_t read_time(void) static inline uint64_t read_time(void)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment