generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avutil/timer: Fix units for x86 after c708b5403346255ea5adc776645616cc7c61f078

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-03-09 15:14:33 +01:00
parent c2923100f5
commit 4159f702a7
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavutil/timer.h
View File

@ -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 @@
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); \
} \ } \
} }

1
libavutil/x86/timer.h
View File

@ -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)