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

alsa-pcm: Change resync warning logic

Browse source 
Log follower resync messages with info level until there has been a
successful read or write to get rid of the initial warning when starting
a stream.
This commit is contained in:
Jonas Holmberg 2022-09-21 16:39:31 +02:00
parent ef39576150
commit dacbeca77e
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1887,15 +1887,14 @@ static int update_time(struct state *state, uint64_t current_time, snd_pcm_sfram
state, follower, state->last_threshold, state->threshold, diff, err); state, follower, state->last_threshold, state->threshold, diff, err);
state->last_threshold = state->threshold; state->last_threshold = state->threshold;
state->alsa_sync = true; state->alsa_sync = true;
state->alsa_sync_warning = false;
} }
if (err > state->max_error) { if (err > state->max_error) {
err = state->max_error; err = state->max_error;
state->alsa_sync = true; state->alsa_sync = true;
state->alsa_sync_warning = (diff == 0);
} else if (err < -state->max_error) { } else if (err < -state->max_error) {
err = -state->max_error; err = -state->max_error;
state->alsa_sync = true; state->alsa_sync = true;
state->alsa_sync_warning = (diff == 0);
} }
if (!follower || state->matching) if (!follower || state->matching)
@ -2014,10 +2013,9 @@ int spa_alsa_write(struct state *state)
if (SPA_UNLIKELY(state->alsa_sync)) { if (SPA_UNLIKELY(state->alsa_sync)) {
enum spa_log_level lev; enum spa_log_level lev;
if (SPA_UNLIKELY(state->alsa_sync_warning)) { if (SPA_UNLIKELY(state->alsa_sync_warning))
lev = SPA_LOG_LEVEL_WARN; lev = SPA_LOG_LEVEL_WARN;
state->alsa_sync_warning = false; else
} else
lev = SPA_LOG_LEVEL_INFO; lev = SPA_LOG_LEVEL_INFO;
if ((missed = ratelimit_test(&state->rate_limit, current_time)) >= 0) { if ((missed = ratelimit_test(&state->rate_limit, current_time)) >= 0) {
@ -2032,7 +2030,8 @@ int spa_alsa_write(struct state *state)
spa_alsa_silence(state, target - delay); spa_alsa_silence(state, target - delay);
delay = target; delay = target;
state->alsa_sync = false; state->alsa_sync = false;
} } else
state->alsa_sync_warning = true;
} }
total_written = 0; total_written = 0;
@ -2248,10 +2247,9 @@ int spa_alsa_read(struct state *state)
if (state->alsa_sync) { if (state->alsa_sync) {
enum spa_log_level lev; enum spa_log_level lev;
if (SPA_UNLIKELY(state->alsa_sync_warning)) { if (SPA_UNLIKELY(state->alsa_sync_warning))
lev = SPA_LOG_LEVEL_WARN; lev = SPA_LOG_LEVEL_WARN;
state->alsa_sync_warning = false; else
} else
lev = SPA_LOG_LEVEL_INFO; lev = SPA_LOG_LEVEL_INFO;
if ((missed = ratelimit_test(&state->rate_limit, current_time)) >= 0) { if ((missed = ratelimit_test(&state->rate_limit, current_time)) >= 0) {
@ -2266,7 +2264,8 @@ int spa_alsa_read(struct state *state)
snd_pcm_forward(state->hndl, delay - target); snd_pcm_forward(state->hndl, delay - target);
delay = target; delay = target;
state->alsa_sync = false; state->alsa_sync = false;
} } else
state->alsa_sync_warning = true;
if (avail < state->read_size) if (avail < state->read_size)
max_read = 0; max_read = 0;
@ -2555,6 +2554,7 @@ int spa_alsa_start(struct state *state)
reset_buffers(state); reset_buffers(state);
state->alsa_sync = true; state->alsa_sync = true;
state->alsa_sync_warning = false;
state->alsa_recovering = false; state->alsa_recovering = false;
state->alsa_started = false; state->alsa_started = false;