RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

timer: use MP_TIME macros

This commit is contained in:
Kacper Michajłow 2023-10-22 04:31:36 +02:00 committed by Dudemanguy
parent 032b7de97f
commit 34d99840a5
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osdep/poll_wrapper.c
View File

@ -29,8 +29,8 @@ int mp_poll(struct pollfd *fds, int nfds, int64_t timeout_ns)
{ {
#if HAVE_PPOLL #if HAVE_PPOLL
struct timespec ts; struct timespec ts;
ts.tv_sec = timeout_ns / UINT64_C(1000000000); ts.tv_sec = timeout_ns / MP_TIME_S_TO_NS(1);
ts.tv_nsec = timeout_ns % UINT64_C(1000000000); ts.tv_nsec = timeout_ns % MP_TIME_S_TO_NS(1);
return ppoll(fds, nfds, &ts, NULL); return ppoll(fds, nfds, &ts, NULL);
#endif #endif
return poll(fds, nfds, timeout_ns / 1e6); return poll(fds, nfds, timeout_ns / 1e6);

6
osdep/timer-linux.c
View File

@ -27,8 +27,8 @@ void mp_sleep_ns(int64_t ns)
if (ns < 0) if (ns < 0)
return; return;
struct timespec ts; struct timespec ts;
ts.tv_sec = ns / UINT64_C(1000000000); ts.tv_sec = ns / MP_TIME_S_TO_NS(1);
ts.tv_nsec = ns % UINT64_C(1000000000); ts.tv_nsec = ns % MP_TIME_S_TO_NS(1);
nanosleep(&ts, NULL); nanosleep(&ts, NULL);
} }
@ -40,7 +40,7 @@ uint64_t mp_raw_time_ns(void)
#else #else
timespec_get(&tp, TIME_UTC); timespec_get(&tp, TIME_UTC);
#endif #endif
return tp.tv_sec * UINT64_C(1000000000) + tp.tv_nsec; return MP_TIME_S_TO_NS(tp.tv_sec) + tp.tv_nsec;
} }
void mp_raw_time_init(void) void mp_raw_time_init(void)

2
video/out/drm_common.c
View File

@ -946,7 +946,7 @@ static void drm_pflip_cb(int fd, unsigned int msc, unsigned int sec,
struct timespec ts; struct timespec ts;
if (clock_gettime(CLOCK_MONOTONIC, &ts)) if (clock_gettime(CLOCK_MONOTONIC, &ts))
goto fail; goto fail;
int64_t now_monotonic = ts.tv_sec * UINT64_C(1000000000) + ts.tv_nsec; int64_t now_monotonic = MP_TIME_S_TO_NS(ts.tv_sec) + ts.tv_nsec;
int64_t ust_mp_time = mp_time_ns() - (now_monotonic - vsync->ust * 1000); int64_t ust_mp_time = mp_time_ns() - (now_monotonic - vsync->ust * 1000);
const uint64_t ust_since_enqueue = vsync->ust - frame_vsync->ust; const uint64_t ust_since_enqueue = vsync->ust - frame_vsync->ust;

2
video/out/present_sync.c
View File

@ -70,7 +70,7 @@ void present_sync_swap(struct mp_present *present)
if (clock_gettime(CLOCK_MONOTONIC, &ts)) if (clock_gettime(CLOCK_MONOTONIC, &ts))
return; return;
int64_t now_monotonic = ts.tv_sec * UINT64_C(1000000000) + ts.tv_nsec; int64_t now_monotonic = MP_TIME_S_TO_NS(ts.tv_sec) + ts.tv_nsec;
int64_t ust_mp_time = mp_time_ns() - (now_monotonic - ust); int64_t ust_mp_time = mp_time_ns() - (now_monotonic - ust);
present->last_queue_display_time = ust_mp_time; present->last_queue_display_time = ust_mp_time;

2
video/out/wayland_common.c
View File

@ -1157,7 +1157,7 @@ static void feedback_presented(void *data, struct wp_presentation_feedback *fbac
// - these values are updated every time the compositor receives feedback. // - these values are updated every time the compositor receives feedback.
int64_t sec = (uint64_t) tv_sec_lo + ((uint64_t) tv_sec_hi << 32); int64_t sec = (uint64_t) tv_sec_lo + ((uint64_t) tv_sec_hi << 32);
int64_t ust = sec * UINT64_C(1000000000) + (uint64_t) tv_nsec; int64_t ust = MP_TIME_S_TO_NS(sec) + (uint64_t) tv_nsec;
int64_t msc = (uint64_t) seq_lo + ((uint64_t) seq_hi << 32); int64_t msc = (uint64_t) seq_lo + ((uint64_t) seq_hi << 32);
present_update_sync_values(wl->present, ust, msc); present_update_sync_values(wl->present, ust, msc);
} }