diff options
| author | Kacper Michajłow <kasper93@gmail.com> | 2023-09-15 16:52:27 +0200 |
|---|---|---|
| committer | Dudemanguy <random342@airmail.cc> | 2023-09-29 20:48:58 +0000 |
| commit | 318b5471a18e464cfcd1f7222da7853b7056f9fc (patch) | |
| tree | 83eee44726747e83fa626289d4febc25d377ce48 | |
| parent | d2630877132edac876779ff31ae61685f09199c4 (diff) | |
| download | mpv-318b5471a18e464cfcd1f7222da7853b7056f9fc.tar.bz2 mpv-318b5471a18e464cfcd1f7222da7853b7056f9fc.tar.xz | |
win32/pthread: don't convert time through unrelated timer
Just keep it directly as mp_time for internal implementation.
| -rw-r--r-- | osdep/timer.c | 12 | ||||
| -rw-r--r-- | osdep/win32/pthread.c | 22 |
2 files changed, 16 insertions, 18 deletions
diff --git a/osdep/timer.c b/osdep/timer.c index 58a44043ca..3e48329ba2 100644 --- a/osdep/timer.c +++ b/osdep/timer.c @@ -27,6 +27,7 @@ #include "common/msg.h" #include "misc/random.h" #include "timer.h" +#include "config.h" static uint64_t raw_time_offset; static pthread_once_t timer_init_once = PTHREAD_ONCE_INIT; @@ -89,6 +90,7 @@ int64_t mp_time_ns_add(int64_t time_ns, double timeout_sec) return time_ns + ti; } +#if !HAVE_WIN32_INTERNAL_PTHREADS static int get_realtime(struct timespec *out_ts) { #if defined(_POSIX_TIMERS) && _POSIX_TIMERS > 0 @@ -102,6 +104,7 @@ static int get_realtime(struct timespec *out_ts) return 0; #endif } +#endif struct timespec mp_time_us_to_realtime(int64_t time_us) { @@ -111,12 +114,17 @@ struct timespec mp_time_us_to_realtime(int64_t time_us) struct timespec mp_time_ns_to_realtime(int64_t time_ns) { struct timespec ts = {0}; + +#if !HAVE_WIN32_INTERNAL_PTHREADS if (get_realtime(&ts) != 0) return ts; + int64_t time_rel = time_ns - mp_time_ns(); +#else + int64_t time_rel = time_ns; +#endif // clamp to 1000 days in the future - int64_t time_rel = MPMIN(mp_time_ns() - time_ns, - 1000 * 24 * 60 * 60 * INT64_C(1000000000)); + time_rel = MPMIN(time_rel, 1000 * 24 * 60 * 60 * INT64_C(1000000000)); ts.tv_sec += time_rel / INT64_C(1000000000); ts.tv_nsec += time_rel % INT64_C(1000000000); diff --git a/osdep/win32/pthread.c b/osdep/win32/pthread.c index a178d72253..905f1107f7 100644 --- a/osdep/win32/pthread.c +++ b/osdep/win32/pthread.c @@ -23,6 +23,7 @@ #include <assert.h> #include <windows.h> +#include "common/common.h" #include "osdep/timer.h" // mp_{start,end}_hires_timers int pthread_once(pthread_once_t *once_control, void (*init_routine)(void)) @@ -95,22 +96,11 @@ int pthread_cond_timedwait(pthread_cond_t *restrict cond, pthread_mutex_t *restrict mutex, const struct timespec *restrict abstime) { - // mpv uses mingw's gettimeofday() as time source too. - struct timeval tv; - gettimeofday(&tv, NULL); - DWORD timeout_ms = 0; - if (abstime->tv_sec >= INT64_MAX / 10000) { - timeout_ms = INFINITE; - } else if (abstime->tv_sec >= tv.tv_sec) { - long long msec = (abstime->tv_sec - tv.tv_sec) * 1000LL + - abstime->tv_nsec / 1000LL / 1000LL - tv.tv_usec / 1000LL; - if (msec > INT_MAX) { - timeout_ms = INFINITE; - } else if (msec > 0) { - timeout_ms = msec; - } - } - return cond_wait(cond, mutex, timeout_ms); + // mp time is not converted to realtime if internal pthread impl is used + int64_t now = mp_time_ns(); + int64_t time_ns = abstime->tv_sec * UINT64_C(1000000000) + abstime->tv_nsec; + int64_t timeout_ms = (time_ns - now) / INT64_C(1000000); + return cond_wait(cond, mutex, MPCLAMP(timeout_ms, 0, INFINITE)); } int pthread_cond_wait(pthread_cond_t *restrict cond, |