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: Do not log warning when resync was expected

Browse source 
Log as info instead of warning when alsa sync was expected.
This commit is contained in:
Jonas Holmberg 2022-05-11 17:41:56 +02:00
parent 6ad59e0117
commit 64c1b62aa8
2 changed files with 19 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1791,9 +1791,11 @@ static int update_time(struct state *state, uint64_t current_time, snd_pcm_sfram
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)
@ -1901,8 +1903,14 @@ int spa_alsa_write(struct state *state)
return res; return res;
if (SPA_UNLIKELY(state->alsa_sync)) { if (SPA_UNLIKELY(state->alsa_sync)) {
spa_log_warn(state->log, "%s: follower delay:%ld target:%ld thr:%u, resync", if (SPA_UNLIKELY(state->alsa_sync_warning)) {
state->props.device, delay, target, state->threshold); spa_log_warn(state->log, "%s: follower delay:%ld target:%ld thr:%u, resync",
state->props.device, delay, target, state->threshold);
state->alsa_sync_warning = false;
} else
spa_log_info(state->log, "%s: follower delay:%ld target:%ld thr:%u, resync",
state->props.device, delay, target, state->threshold);
if (delay > target) if (delay > target)
snd_pcm_rewind(state->hndl, delay - target); snd_pcm_rewind(state->hndl, delay - target);
else if (delay < target) else if (delay < target)
@ -2139,8 +2147,14 @@ int spa_alsa_read(struct state *state)
avail = delay; avail = delay;
if (state->alsa_sync) { if (state->alsa_sync) {
spa_log_warn(state->log, "%s: follower delay:%lu target:%lu thr:%u, resync", if (SPA_UNLIKELY(state->alsa_sync_warning)) {
state->props.device, delay, target, threshold); spa_log_warn(state->log, "%s: follower delay:%lu target:%lu thr:%u, resync",
state->props.device, delay, target, threshold);
state->alsa_sync_warning = false;
} else
spa_log_info(state->log, "%s: follower delay:%lu target:%lu thr:%u, resync",
state->props.device, delay, target, threshold);
if (delay < target) if (delay < target)
max_read = target - delay; max_read = target - delay;
else if (delay > target) else if (delay > target)

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

@ -192,6 +192,7 @@ struct state {
uint32_t duration; uint32_t duration;
unsigned int alsa_started:1; unsigned int alsa_started:1;
unsigned int alsa_sync:1; unsigned int alsa_sync:1;
unsigned int alsa_sync_warning:1;
unsigned int alsa_recovering:1; unsigned int alsa_recovering:1;
unsigned int following:1; unsigned int following:1;
unsigned int matching:1; unsigned int matching:1;