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

latency: handle negative latency correctly

Browse source 
In our current world, it is possible to have a negative delay. This
means that the stream should be delayed to sync with other streams.

The pulse-server sets negative delay and the Latency message can hold
those negative values so make sure we handle them in the helper
functions as well.

Do the delay calculations in pw_stream and JACK with signed values to
correctly handle negative values. Clamp JACK latency range to 0 because
negative latency is not supported in JACK.

We should also probably make sure we never end up with negative
latency, mostly in ALSA when we set a Latency offset, but that is
another detail.
This commit is contained in:
Wim Taymans 2024-10-23 10:47:58 +02:00
parent 9243ed0cbd
commit da86026b7a
5 changed files with 40 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -6583,6 +6583,7 @@ void jack_port_get_latency_range (jack_port_t *port, jack_latency_callback_mode_
jack_nframes_t nframes, rate;
int direction;
struct spa_latency_info *info;
int64_t min, max;
return_if_fail(o != NULL);
c = o->client;
@ -6601,10 +6602,15 @@ void jack_port_get_latency_range (jack_port_t *port, jack_latency_callback_mode_
rate = jack_get_sample_rate((jack_client_t*)c);
info = &o->port.latency[direction];
range->min = (jack_nframes_t)((info->min_quantum * nframes) +
info->min_rate + (info->min_ns * rate) / SPA_NSEC_PER_SEC);
range->max = (jack_nframes_t)((info->max_quantum * nframes) +
info->max_rate + (info->max_ns * rate) / SPA_NSEC_PER_SEC);
min = (int64_t)(info->min_quantum * nframes) +
info->min_rate +
(info->min_ns * (int64_t)rate) / (int64_t)SPA_NSEC_PER_SEC;
max = (int64_t)(info->max_quantum * nframes) +
info->max_rate +
(info->max_ns * (int64_t)rate) / (int64_t)SPA_NSEC_PER_SEC;
range->min = SPA_MAX(min, 0);
range->max = SPA_MAX(max, 0);
pw_log_debug("%p: %s get %d latency range %d %d", c, o->port.name,
mode, range->min, range->max);
@ -6649,13 +6655,13 @@ void jack_port_set_latency_range (jack_port_t *port, jack_latency_callback_mode_
nframes = 1;
latency.min_rate = range->min;
if (latency.min_rate >= nframes) {
if (latency.min_rate >= (int32_t)nframes) {
latency.min_quantum = latency.min_rate / nframes;
latency.min_rate %= nframes;
}
latency.max_rate = range->max;
if (latency.max_rate >= nframes) {
if (latency.max_rate >= (int32_t)nframes) {
latency.max_quantum = latency.max_rate / nframes;
latency.max_rate %= nframes;
}