Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

upipe_voidsrc: align timestamps #968

Merged
merged 1 commit into from
Mar 27, 2024
+6 −4
Merged

upipe_voidsrc: align timestamps #968

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions lib/upipe-modules/upipe_void_source.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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);

Expand All @@ -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;

Expand Down