mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-31 22:25:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

alsa: update resample state in all cases

Browse source 
We need to manually recheck the resample state when the matching state
got updated.
This commit is contained in:
Wim Taymans 2025-07-18 19:20:00 +02:00
parent 5fba59b41d
commit f2fb0b0aa5
1 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2902,6 +2902,13 @@ static int update_time(struct state *state, uint64_t current_time, snd_pcm_sfram
return 0; return 0;
} }
static bool need_resample(struct state *state)
{
return !state->pitch_elem &&
((state->rate != 0 && state->driver_rate.denom != 0 &&
(uint32_t)state->rate != state->driver_rate.denom) || state->matching);
}
static int setup_matching(struct state *state) static int setup_matching(struct state *state)
{ {
state->matching = state->following; state->matching = state->following;
@ -2915,6 +2922,8 @@ static int setup_matching(struct state *state)
if (spa_streq(state->position->clock.name, state->clock_name)) if (spa_streq(state->position->clock.name, state->clock_name))
state->matching = false; state->matching = false;
state->resample = need_resample(state);
check_position_config(state, false); check_position_config(state, false);
recalc_headroom(state); recalc_headroom(state);
@ -2974,9 +2983,7 @@ static inline int check_position_config(struct state *state, bool starting)
state->max_error = SPA_MAX(256.0f, (state->threshold + state->headroom) / 2.0f); state->max_error = SPA_MAX(256.0f, (state->threshold + state->headroom) / 2.0f);
state->max_resync = SPA_MIN(state->threshold + state->headroom, state->max_error); state->max_resync = SPA_MIN(state->threshold + state->headroom, state->max_error);
state->err_wdw = (double)state->driver_rate.denom/state->driver_duration; state->err_wdw = (double)state->driver_rate.denom/state->driver_duration;
state->resample = !state->pitch_elem && state->resample = need_resample(state);
((state->rate != 0 && state->driver_rate.denom != 0 &&
(uint32_t)state->rate != state->driver_rate.denom) || state->matching);
state->alsa_sync = true; state->alsa_sync = true;
} }
return 0; return 0;