From 300a19872460c7432919e606fc7630ca8f565624 Mon Sep 17 00:00:00 2001 From: Sebastian Reimers Date: Fri, 30 Dec 2022 12:16:02 +0100 Subject: [PATCH] vidmix: fix VIDEO_TIMEBASE --- include/rem_vidmix.h | 2 +- src/vidmix/vidmix.c | 21 +++++++++++++-------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/include/rem_vidmix.h b/include/rem_vidmix.h index b0a04b7..d806c4b 100644 --- a/include/rem_vidmix.h +++ b/include/rem_vidmix.h @@ -15,7 +15,7 @@ struct vidmix_source; * @param frame Video frame * @param arg Handler argument */ -typedef void (vidmix_frame_h)(uint32_t ts, const struct vidframe *frame, +typedef void (vidmix_frame_h)(uint64_t ts, const struct vidframe *frame, void *arg); int vidmix_alloc(struct vidmix **mixp); diff --git a/src/vidmix/vidmix.c b/src/vidmix/vidmix.c index c946097..c603ccf 100644 --- a/src/vidmix/vidmix.c +++ b/src/vidmix/vidmix.c @@ -16,6 +16,11 @@ #include #include +/* + * Clock-rate for video timestamp + */ +#define VIDEO_TIMEBASE 1000000U + struct vidmix { mtx_t rwlock; @@ -186,7 +191,7 @@ static int vidmix_thread(void *arg) { struct vidmix_source *src = arg; struct vidmix *mix = src->mix; - uint64_t ts = tmr_jiffies(); + uint64_t ts = tmr_jiffies_usec(); mtx_lock(&src->mutex); @@ -200,7 +205,7 @@ static int vidmix_thread(void *arg) sys_usleep(4000); mtx_lock(&src->mutex); - now = tmr_jiffies(); + now = tmr_jiffies_usec(); if (ts > now) continue; @@ -258,7 +263,7 @@ static int vidmix_thread(void *arg) mtx_unlock(&mix->rwlock); - src->fh((uint32_t)ts * 90, src->frame_tx, src->arg); + src->fh(ts, src->frame_tx, src->arg); ts += src->fint; } @@ -273,7 +278,7 @@ static int content_thread(void *arg) { struct vidmix_source *src = arg; struct vidmix *mix = src->mix; - uint64_t ts = tmr_jiffies(); + uint64_t ts = tmr_jiffies_usec(); mtx_lock(&src->mutex); @@ -286,7 +291,7 @@ static int content_thread(void *arg) sys_usleep(4000); mtx_lock(&src->mutex); - now = tmr_jiffies(); + now = tmr_jiffies_usec(); if (ts > now) continue; @@ -300,7 +305,7 @@ static int content_thread(void *arg) if (!lsrc->content || !lsrc->frame_rx || lsrc == src) continue; - src->fh((uint32_t)ts * 90, lsrc->frame_rx, src->arg); + src->fh(ts, lsrc->frame_rx, src->arg); break; } @@ -380,7 +385,7 @@ int vidmix_source_alloc(struct vidmix_source **srcp, struct vidmix *mix, return ENOMEM; src->mix = mem_ref(mix); - src->fint = 1000/fps; + src->fint = VIDEO_TIMEBASE/fps; src->content = content; src->fh = fh; src->arg = arg; @@ -577,7 +582,7 @@ void vidmix_source_set_rate(struct vidmix_source *src, unsigned fps) return; mtx_lock(&src->mutex); - src->fint = 1000/fps; + src->fint = VIDEO_TIMEBASE/fps; mtx_unlock(&src->mutex); }