From 9268cc983d3f0ac82ce02ff5ed469f78b6dd7587 Mon Sep 17 00:00:00 2001 From: Arnaud de Turckheim Date: Wed, 10 Jan 2024 10:15:35 +0100 Subject: [PATCH] upipe_voidsrc: align timestamps --- lib/upipe-modules/upipe_void_source.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/upipe-modules/upipe_void_source.c b/lib/upipe-modules/upipe_void_source.c index 2ccd4e221..b348498f6 100644 --- a/lib/upipe-modules/upipe_void_source.c +++ b/lib/upipe-modules/upipe_void_source.c @@ -166,10 +166,12 @@ static void upipe_voidsrc_worker(struct upump *upump) { struct upipe *upipe = upump_get_opaque(upump, struct upipe *); struct upipe_voidsrc *upipe_voidsrc = upipe_voidsrc_from_upipe(upipe); + uint64_t interval = upipe_voidsrc->interval; uint64_t now = uclock_now(upipe_voidsrc->uclock); if (upipe_voidsrc->pts == UINT64_MAX) - upipe_voidsrc->pts = now; + upipe_voidsrc->pts = ((now - 1) / interval) * interval + interval; + for (/* nothing */; !upipe_single(upipe) && upipe_voidsrc->pts <= now; @@ -180,11 +182,11 @@ static void upipe_voidsrc_worker(struct upump *upump) return; } - uref_clock_set_duration(uref, upipe_voidsrc->interval); + uref_clock_set_duration(uref, interval); uref_clock_set_pts_sys(uref, upipe_voidsrc->pts); uref_clock_set_pts_prog(uref, upipe_voidsrc->pts); if (upipe_voidsrc->pts != UINT64_MAX) - upipe_voidsrc->pts += upipe_voidsrc->interval; + upipe_voidsrc->pts += interval; upipe_voidsrc_output(upipe, uref, &upipe_voidsrc->timer); @@ -194,7 +196,7 @@ static void upipe_voidsrc_worker(struct upump *upump) break; } - uint64_t wait = upipe_voidsrc->interval; + uint64_t wait = interval; if (now != UINT64_MAX) wait = upipe_voidsrc->pts - now;