highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit 'c708b5403346255ea5adc776645616cc7c61f078'

Browse Source 
* commit 'c708b5403346255ea5adc776645616cc7c61f078':
  timer: use mach_absolute_time as high resolution clock on darwin

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-03-09 14:30:24 +01:00
parent fa4f573997 c708b54033
commit c2923100f5
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libavutil/timer.h
View File

@ -32,6 +32,10 @@
#include "config.h"
#if HAVE_MACH_MACH_TIME_H
#include <mach/mach_time.h>
#endif
#include "log.h"
#if ARCH_ARM
@ -44,8 +48,12 @@
# include "x86/timer.h"
#endif
#if !defined(AV_READ_TIME) && HAVE_GETHRTIME
# define AV_READ_TIME gethrtime
#if !defined(AV_READ_TIME)
# if HAVE_GETHRTIME
# define AV_READ_TIME gethrtime
# elif HAVE_MACH_ABSOLUTE_TIME
# define AV_READ_TIME mach_absolute_time
# endif
#endif
#ifdef AV_READ_TIME
@ -68,7 +76,7 @@
tskip_count++; \
if (((tcount + tskip_count) & (tcount + tskip_count - 1)) == 0) { \
av_log(NULL, AV_LOG_ERROR, \
"%"PRIu64" decicycles in %s, %d runs, %d skips\n", \
"%"PRIu64" UNITS in %s, %d runs, %d skips\n", \
tsum * 10 / tcount, id, tcount, tskip_count); \
} \
}