precise macosx timer by Dan Christiansen <danchr@daimi.au.dk> and 10l fix by me

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9466 b3059339-0415-0410-9bf9-f77b7e298cf2

2 files changed, 73 insertions, 2 deletions

diff --git a/osdep/Makefile b/osdep/Makefile
index f42b913d07..0309d7ebad 100644
--- a/osdep/Makefile
+++ b/osdep/Makefile
@@ -3,8 +3,7 @@ include ../config.mak
 
 LIBNAME = libosdep.a
 
-SRCS=getch2.c timer-lx.c shmem.c strsep.c vsscanf.c scandir.c # timer.c
-OBJS=$(SRCS:.c=.o)
+SRCS=getch2.c shmem.c strsep.c vsscanf.c scandir.c # timer.c
 
 ifeq ($(TARGET_ARCH_X86),yes)
 ifeq ($(TARGET_OS),Linux)
@@ -12,6 +11,14 @@ SRCS += lrmi.c vbelib.c
 endif
 endif
 
+ifeq ($(MACOSX),yes)
+SRCS += timer-macosx.c
+else
+SRCS += timer-lx.c
+endif
+
+OBJS=$(SRCS:.c=.o)
+
 CFLAGS  = $(OPTFLAGS) -I. -I.. $(EXTRA_INC)
 # -I/usr/X11R6/include/
 
diff --git a/osdep/timer-macosx.c b/osdep/timer-macosx.c
new file mode 100644
index 0000000000..ee2200ddc1
--- /dev/null
+++ b/osdep/timer-macosx.c
@@ -0,0 +1,64 @@
+/*
+ * Semi-precise timer routines using CoreFoundation
+ *
+ * (C) 2003 Dan Christiansen
+ *
+ * Released into the public domain.
+ */
+
+#include <unistd.h>
+#include <stdlib.h>
+#include <time.h>
+#include <sys/time.h>
+#include "../config.h"
+
+#ifdef MACOSX
+# include <CoreFoundation/CFRunLoop.h>
+#endif
+
+/* Rather than using CF timers, we simply store the absolute time 
+ * CFAbsoluteTime == double */
+static CFAbsoluteTime relative_time;
+
+int usec_sleep(int usec_delay)
+{
+  CFRunLoopRunInMode(kCFRunLoopDefaultMode,  usec_delay / 1000000.0, false);
+}
+
+
+// Returns current time in microseconds
+unsigned int GetTimer(){
+  return (unsigned int)(CFAbsoluteTimeGetCurrent() * 1000000);
+}  
+
+// Returns current time in milliseconds
+unsigned int GetTimerMS(){
+  return (unsigned int)(CFAbsoluteTimeGetCurrent() * 1000);
+}
+
+// Returns time spent between now and last call in seconds
+float GetRelativeTime(){
+  CFAbsoluteTime last_time = relative_time;
+  relative_time = CFAbsoluteTimeGetCurrent();
+  return (float)(relative_time - last_time);
+}
+
+// Initialize timer, must be called at least once at start
+void InitTimer(){
+  GetRelativeTime();
+}
+
+#if 0
+int main() {
+  int i;
+
+  for (i = 0; i < 20; i++) {
+    printf("CF relative time:\t%f\n", GetRelativeTime());
+    usec_sleep(1000000);
+    printf("usleep relative time:\t%f\n", GetRelativeTime());
+    usleep(1000000);
+  }
+}
+#endif
+
+