From 8fef0408b66cd49485c8626308f67bf5d86fbeeb Mon Sep 17 00:00:00 2001
From: Maxim Devaev <mdevaev@gmail.com>
Date: Wed, 28 Jan 2026 11:05:50 +0200
Subject: [PATCH] janus: time functions refactored

---
 janus/src/rtpv.c |  3 +--
 src/libs/tools.h | 36 ++++++++++++++++++++++--------------
 2 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/janus/src/rtpv.c b/janus/src/rtpv.c
index 17bd053..a5b6fa5 100644
--- a/janus/src/rtpv.c
+++ b/janus/src/rtpv.c
@@ -90,8 +90,7 @@ void us_rtpv_wrap(us_rtpv_s *rtpv, const us_frame_s *frame, bool zero_playout_de
 	assert(frame->format == V4L2_PIX_FMT_H264);
 
 	rtpv->rtp->zero_playout_delay = zero_playout_delay;
-	rtpv->rtp->grab_ntp_ts =
-		us_get_now_ntp() - (us_get_now_monotonic() - frame->grab_begin_ts) * NTP_TICKS_IN_SECOND;
+	rtpv->rtp->grab_ntp_ts = us_get_now_ntp() - us_ld_to_ntp(us_get_now_monotonic() - frame->grab_begin_ts);
 
 	const u32 pts = us_get_now_monotonic_u64() * 9 / 100; // PTS units are in 90 kHz
 	sz last_offset = -_PRE;
diff --git a/src/libs/tools.h b/src/libs/tools.h
index ba8dc75..c8c5b80 100644
--- a/src/libs/tools.h
+++ b/src/libs/tools.h
@@ -85,8 +85,6 @@
 
 #define US_ONCE(...) US_ONCE_FOR(once, __LINE__, ##__VA_ARGS__)
 
-#define NTP_UNIX_TIME_DIFF 2208988800u // difference between Unix time and NTP time in seconds (1970 - 1900)
-#define NTP_TICKS_IN_SECOND 4294967296u // ticks per second in NTP time
 
 INLINE char *us_strdup(const char *str) {
 	char *const new = strdup(str);
@@ -143,12 +141,6 @@ INLINE u64 us_get_now_monotonic_u64(void) {
 	return (u64)(ts.tv_nsec / 1000) + (u64)ts.tv_sec * 1000000;
 }
 
-INLINE u64 us_get_now_ntp(void) {
-	struct timespec ts;
-	assert(!clock_gettime(CLOCK_REALTIME, &ts));
-	return (((u64)ts.tv_sec + NTP_UNIX_TIME_DIFF) << 32) + ((u64)ts.tv_nsec / 1000 * NTP_TICKS_IN_SECOND ) / 1000000;
-}
-
 INLINE u64 us_get_now_id(void) {
 	const u64 now = us_get_now_monotonic_u64();
 	return (u64)us_triple_u32(now) | ((u64)us_triple_u32(now + 12345) << 32);
@@ -161,12 +153,6 @@ INLINE ldf us_get_now_real(void) {
 	return (ldf)sec + ((ldf)msec) / 1000;
 }
 
-INLINE uint us_get_cores_available(void) {
-	long cores_sysconf = sysconf(_SC_NPROCESSORS_ONLN);
-	cores_sysconf = (cores_sysconf < 0 ? 0 : cores_sysconf);
-	return US_MAX(US_MIN(cores_sysconf, 4), 1);
-}
-
 INLINE void us_ld_to_timespec(ldf ld, struct timespec *ts) {
 	ts->tv_sec = (long)ld;
 	ts->tv_nsec = (ld - ts->tv_sec) * 1000000000L;
@@ -180,6 +166,28 @@ INLINE ldf us_timespec_to_ld(const struct timespec *ts) {
 	return ts->tv_sec + ((ldf)ts->tv_nsec) / 1000000000;
 }
 
+#define NTP_UNIX_TIME_DIFF	2208988800u // Difference between Unix time and NTP time in seconds (1970 - 1900)
+#define NTP_TICKS_IN_SECOND	4294967296u // Ticks per second in NTP time
+
+INLINE u64 us_get_now_ntp(void) {
+	struct timespec ts;
+	US_A(!clock_gettime(CLOCK_REALTIME, &ts));
+	return (((u64)ts.tv_sec + NTP_UNIX_TIME_DIFF) << 32) + ((u64)ts.tv_nsec / 1000 * NTP_TICKS_IN_SECOND) / 1000000;
+}
+
+INLINE u64 us_ld_to_ntp(ldf ld) {
+	return (ld > 0 ? ld * NTP_TICKS_IN_SECOND : 0);
+}
+
+#undef NTP_TICKS_IN_SECOND
+#undef NTP_UNIX_TIME_DIFF
+
+INLINE uint us_get_cores_available(void) {
+	long cores_sysconf = sysconf(_SC_NPROCESSORS_ONLN);
+	cores_sysconf = (cores_sysconf < 0 ? 0 : cores_sysconf);
+	return US_MAX(US_MIN(cores_sysconf, 4), 1);
+}
+
 INLINE int us_flock_timedwait_monotonic(int fd, ldf timeout) {
 	const ldf deadline_ts = us_get_now_monotonic() + timeout;
 	int retval = -1;