mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-12-16 08:56:45 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

alsa: separate max_error and max_resync

Browse source 
Use a separate variable to hold the maximum amount of drift we allow
between driver and follower. Ensure this value is smaller than the max_error
and period size so that we have at most 1 period of drift.
This commit is contained in:
Wim Taymans 2023-04-10 16:28:55 +02:00
parent 30657abf28
commit 261fb64849
2 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
spa/plugins/alsa/alsa-pcm.c
View file

@ -1969,12 +1969,14 @@ static int update_time(struct state *state, uint64_t current_time, snd_pcm_sfram
state->alsa_sync = true; state->alsa_sync = true;
state->alsa_sync_warning = false; state->alsa_sync_warning = false;
} }
if (err > state->max_error) { if (err > state->max_resync) {
err = state->max_error;
state->alsa_sync = true; state->alsa_sync = true;
} else if (err < -state->max_error) { if (err > state->max_error)
err = -state->max_error; err = state->max_error;
} else if (err < -state->max_resync) {
state->alsa_sync = true; state->alsa_sync = true;
if (err < -state->max_error)
err = -state->max_error;
} }
if (!follower || state->matching) if (!follower || state->matching)
@ -2079,6 +2081,7 @@ static inline int check_position_config(struct state *state)
return -EIO; return -EIO;
state->threshold = SPA_SCALE32_UP(state->duration, state->rate, state->rate_denom); state->threshold = SPA_SCALE32_UP(state->duration, state->rate, state->rate_denom);
state->max_error = SPA_MAX(256.0f, state->threshold / 2.0f); state->max_error = SPA_MAX(256.0f, state->threshold / 2.0f);
state->max_resync = SPA_MIN(state->threshold, state->max_error);
state->resample = ((uint32_t)state->rate != state->rate_denom) || state->matching; state->resample = ((uint32_t)state->rate != state->rate_denom) || state->matching;
state->alsa_sync = true; state->alsa_sync = true;
} }

1
spa/plugins/alsa/alsa-pcm.h
View file

@ -213,6 +213,7 @@ struct state {
struct spa_dll dll; struct spa_dll dll;
double max_error; double max_error;
double max_resync;
struct spa_latency_info latency[2]; struct spa_latency_info latency[2];
struct spa_process_latency_info process_latency; struct spa_process_latency_info process_latency;