remap: Change remapping function argument type from void to int16_t / float as approp...

[pulseaudio] / src / pulsecore / core-rtclock.c

diff --git a/src/pulsecore/core-rtclock.c b/src/pulsecore/core-rtclock.c
index 110158bab74ff8f2217ecbf92cf065ec4f6fce14..ee045549c6a1dcba38c6e8c48e9535b0f637ac86 100644 (file)
--- a/src/pulsecore/core-rtclock.c
+++ b/src/pulsecore/core-rtclock.c
@@ -24,6 +24,10 @@
 #include <config.h>
 #endif
 
+#ifdef OS_IS_DARWIN
+#define _POSIX_C_SOURCE 1
+#endif
+
 #include <stddef.h>
 #include <time.h>
 #include <sys/time.h>
@@ -40,12 +44,20 @@
 #include <unistd.h>
 #endif
 
+#ifdef HAVE_WINDOWS_H
+#include <windows.h>
+#endif
+
 #include <pulse/timeval.h>
 #include <pulsecore/macro.h>
 #include <pulsecore/core-error.h>
 
 #include "core-rtclock.h"
 
+#ifdef OS_IS_WIN32
+static int64_t counter_freq = 0;
+#endif
+
 pa_usec_t pa_rtclock_age(const struct timeval *tv) {
     struct timeval now;
     pa_assert(tv);
@@ -72,11 +84,11 @@ struct timeval *pa_rtclock_get(struct timeval *tv) {
 
 #ifdef CLOCK_MONOTONIC
     /* No locking or atomic ops for no_monotonic here */
-    static pa_bool_t no_monotonic = FALSE;
+    static bool no_monotonic = false;
 
     if (!no_monotonic)
         if (clock_gettime(CLOCK_MONOTONIC, &ts) < 0)
-            no_monotonic = TRUE;
+            no_monotonic = true;
 
     if (no_monotonic)
 #endif /* CLOCK_MONOTONIC */
@@ -88,12 +100,23 @@ struct timeval *pa_rtclock_get(struct timeval *tv) {
     tv->tv_usec = ts.tv_nsec / PA_NSEC_PER_USEC;
 
     return tv;
+#elif defined(OS_IS_WIN32)
+    if (counter_freq > 0) {
+        LARGE_INTEGER count;
+
+        pa_assert_se(QueryPerformanceCounter(&count));
+
+        tv->tv_sec = count.QuadPart / counter_freq;
+        tv->tv_usec = (count.QuadPart % counter_freq) * PA_USEC_PER_SEC / counter_freq;
+
+        return tv;
+    }
 #endif /* HAVE_CLOCK_GETTIME */
 
     return pa_gettimeofday(tv);
 }
 
-pa_bool_t pa_rtclock_hrtimer(void) {
+bool pa_rtclock_hrtimer(void) {
 
 #if defined (OS_IS_DARWIN)
     mach_timebase_info_data_t tbi;
@@ -118,9 +141,14 @@ pa_bool_t pa_rtclock_hrtimer(void) {
     pa_assert_se(clock_getres(CLOCK_REALTIME, &ts) == 0);
     return ts.tv_sec == 0 && ts.tv_nsec <= (long) (PA_HRTIMER_THRESHOLD_USEC*PA_NSEC_PER_USEC);
 
+#elif defined(OS_IS_WIN32)
+
+    if (counter_freq > 0)
+        return counter_freq >= (int64_t) (PA_USEC_PER_SEC/PA_HRTIMER_THRESHOLD_USEC);
+
 #endif /* HAVE_CLOCK_GETTIME */
 
-    return FALSE;
+    return false;
 }
 
 #define TIMER_SLACK_NS (int) ((500 * PA_NSEC_PER_USEC))
@@ -148,19 +176,23 @@ void pa_rtclock_hrtimer_enable(void) {
         }
     }
 
+#elif defined(OS_IS_WIN32)
+    LARGE_INTEGER freq;
+
+    pa_assert_se(QueryPerformanceFrequency(&freq));
+    counter_freq = freq.QuadPart;
+
 #endif
 }
 
 struct timeval* pa_rtclock_from_wallclock(struct timeval *tv) {
-
-#ifdef HAVE_CLOCK_GETTIME
     struct timeval wc_now, rt_now;
 
+    pa_assert(tv);
+
     pa_gettimeofday(&wc_now);
     pa_rtclock_get(&rt_now);
 
-    pa_assert(tv);
-
     /* pa_timeval_sub() saturates on underflow! */
 
     if (pa_timeval_cmp(&wc_now, tv) < 0)
@@ -169,11 +201,11 @@ struct timeval* pa_rtclock_from_wallclock(struct timeval *tv) {
         pa_timeval_sub(&rt_now, pa_timeval_diff(&wc_now, tv));
 
     *tv = rt_now;
-#endif
 
     return tv;
 }
 
+#ifdef HAVE_CLOCK_GETTIME
 pa_usec_t pa_timespec_load(const struct timespec *ts) {
 
     if (PA_UNLIKELY(!ts))
@@ -198,17 +230,16 @@ struct timespec* pa_timespec_store(struct timespec *ts, pa_usec_t v) {
 
     return ts;
 }
+#endif
 
 static struct timeval* wallclock_from_rtclock(struct timeval *tv) {
-
-#ifdef HAVE_CLOCK_GETTIME
     struct timeval wc_now, rt_now;
 
+    pa_assert(tv);
+
     pa_gettimeofday(&wc_now);
     pa_rtclock_get(&rt_now);
 
-    pa_assert(tv);
-
     /* pa_timeval_sub() saturates on underflow! */
 
     if (pa_timeval_cmp(&rt_now, tv) < 0)
@@ -217,12 +248,11 @@ static struct timeval* wallclock_from_rtclock(struct timeval *tv) {
         pa_timeval_sub(&wc_now, pa_timeval_diff(&rt_now, tv));
 
     *tv = wc_now;
-#endif
 
     return tv;
 }
 
-struct timeval* pa_timeval_rtstore(struct timeval *tv, pa_usec_t v, pa_bool_t rtclock) {
+struct timeval* pa_timeval_rtstore(struct timeval *tv, pa_usec_t v, bool rtclock) {
     pa_assert(tv);
 
     if (v == PA_USEC_INVALID)