mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-29 05:40:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

jack: improve frame to and from time functions

Browse source 
Also support times and frames before the current one by doing a signed
diff.
Also take into account the rate adjusted period time.
This commit is contained in:
Wim Taymans 2023-02-09 16:44:47 +01:00
parent b94cb5d99d
commit 274b63e972
1 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

18
pipewire-jack/src/pipewire-jack.c
View file

@ -5784,15 +5784,17 @@ jack_time_t jack_frames_to_time(const jack_client_t *client, jack_nframes_t fram
{
struct client *c = (struct client *) client;
struct spa_io_position *pos;
double df;
spa_return_val_if_fail(c != NULL, -EINVAL);
if (SPA_UNLIKELY((pos = c->rt.position) == NULL))
if (SPA_UNLIKELY((pos = c->rt.position) == NULL) || c->buffer_frames == 0)
return 0;
df = (frames - pos->clock.position) * (double)SPA_NSEC_PER_SEC / c->sample_rate;
return (pos->clock.nsec + (int64_t)rint(df)) / SPA_NSEC_PER_USEC;
uint64_t w = pos->clock.nsec/SPA_NSEC_PER_USEC;
uint64_t nw = pos->clock.next_nsec/SPA_NSEC_PER_USEC;
int64_t df = (uint64_t)frames - pos->clock.position;
int64_t dp = nw - w;
return w + (int64_t)rint((double) df * (double) dp / c->buffer_frames);
}
SPA_EXPORT
@ -5800,15 +5802,17 @@ jack_nframes_t jack_time_to_frames(const jack_client_t *client, jack_time_t usec
{
struct client *c = (struct client *) client;
struct spa_io_position *pos;
double du;
spa_return_val_if_fail(c != NULL, -EINVAL);
if (SPA_UNLIKELY((pos = c->rt.position) == NULL))
return 0;
du = (usecs - pos->clock.nsec/SPA_NSEC_PER_USEC) * (double)c->sample_rate / SPA_USEC_PER_SEC;
return pos->clock.position + (int32_t)rint(du);
uint64_t w = pos->clock.nsec/SPA_NSEC_PER_USEC;
uint64_t nw = pos->clock.next_nsec/SPA_NSEC_PER_USEC;
int64_t du = usecs - w;
int64_t dp = nw - w;
return pos->clock.position + (int64_t)rint((double)du / (double)dp * c->buffer_frames);
}
SPA_EXPORT