mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-03 09:01:54 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

jack: fix frame time

Browse source
This commit is contained in:
Wim Taymans 2019-08-22 14:30:44 +02:00
parent 45f0e7c35b
commit 42f144e097
1 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/pipewire-jack.c
View file

@ -3042,13 +3042,11 @@ jack_nframes_t jack_frames_since_cycle_start (const jack_client_t *client)
{ {
struct client *c = (struct client *) client; struct client *c = (struct client *) client;
struct timespec ts; struct timespec ts;
jack_nframes_t res;
uint64_t diff; uint64_t diff;
clock_gettime(CLOCK_MONOTONIC, &ts); clock_gettime(CLOCK_MONOTONIC, &ts);
diff = SPA_TIMESPEC_TO_USEC(&ts) - c->jack_position.usecs; diff = SPA_TIMESPEC_TO_USEC(&ts) - c->jack_position.usecs;
res = (jack_nframes_t) floor(((float)c->sample_rate * diff) / 1000000000.0f); return (jack_nframes_t) floor(((float)c->sample_rate * diff) / 1000000000.0f);
return res;
} }
SPA_EXPORT SPA_EXPORT
@ -3088,16 +3086,16 @@ SPA_EXPORT
jack_time_t jack_frames_to_time(const jack_client_t *client, jack_nframes_t frames) jack_time_t jack_frames_to_time(const jack_client_t *client, jack_nframes_t frames)
{ {
struct client *c = (struct client *) client; struct client *c = (struct client *) client;
int32_t df = frames - c->jack_position.frame; double df = (frames - c->jack_position.frame) * (double)SPA_USEC_PER_SEC / c->sample_rate;
return c->jack_position.usecs + (int64_t)rint((double) df / c->sample_rate); return c->jack_position.usecs + (int64_t)rint(df);
} }
SPA_EXPORT SPA_EXPORT
jack_nframes_t jack_time_to_frames(const jack_client_t *client, jack_time_t usecs) jack_nframes_t jack_time_to_frames(const jack_client_t *client, jack_time_t usecs)
{ {
struct client *c = (struct client *) client; struct client *c = (struct client *) client;
int64_t du = usecs - c->jack_position.usecs; double du = (usecs - c->jack_position.usecs) * (double)c->sample_rate / SPA_USEC_PER_SEC;
return c->jack_position.frame + (int32_t)rint((double)du * c->sample_rate); return c->jack_position.frame + (int32_t)rint(du);
} }
SPA_EXPORT SPA_EXPORT