system/pipewire
system/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire synced 2024-09-19 16:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

alsa: improve debug

Browse source 
Remove the rather useless dll values.
Add the threshold
This commit is contained in:
Wim Taymans 2021-12-07 12:05:49 +01:00
parent dfb82f6f46
commit 30a78fe2b8
1 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1596,10 +1596,10 @@ static int update_time(struct state *state, uint64_t nsec, snd_pcm_sframes_t del
state->base_time = state->next_time; state->base_time = state->next_time;
spa_log_debug(state->log, "%p: follower:%d match:%d rate:%f " spa_log_debug(state->log, "%p: follower:%d match:%d rate:%f "
"bw:%f thr:%d del:%ld target:%ld err:%f (%f %f %f)", "bw:%f thr:%u del:%ld target:%ld err:%f",
state, follower, state->matching, corr, state->dll.bw, state, follower, state->matching, corr, state->dll.bw,
state->threshold, delay, target, state->threshold, delay, target,
err, state->dll.z1, state->dll.z2, state->dll.z3); err);
} }
if (state->rate_match) { if (state->rate_match) {
@ -1622,7 +1622,7 @@ static int update_time(struct state *state, uint64_t nsec, snd_pcm_sframes_t del
state->clock->next_nsec = state->next_time; state->clock->next_nsec = state->next_time;
} }
spa_log_trace_fp(state->log, "%p: follower:%d %"PRIu64" %f %ld %f %f %d", spa_log_trace_fp(state->log, "%p: follower:%d %"PRIu64" %f %ld %f %f %u",
state, follower, nsec, corr, delay, err, state->threshold * corr, state, follower, nsec, corr, delay, err, state->threshold * corr,
state->threshold); state->threshold);
@ -1684,9 +1684,8 @@ int spa_alsa_write(struct state *state)
return res; return res;
if (SPA_UNLIKELY(!state->alsa_recovering && delay > target + state->threshold)) { if (SPA_UNLIKELY(!state->alsa_recovering && delay > target + state->threshold)) {
spa_log_warn(state->log, "%s: follower delay:%ld target:%ld resync %f %f %f", spa_log_warn(state->log, "%s: follower delay:%ld target:%ld thr:%u, resync",
state->props.device, delay, target + state->threshold, state->props.device, delay, target, state->threshold);
state->dll.z1, state->dll.z2, state->dll.z3);
spa_dll_init(&state->dll); spa_dll_init(&state->dll);
state->alsa_sync = true; state->alsa_sync = true;
} }
@ -1941,15 +1940,14 @@ int spa_alsa_read(struct state *state)
return res; return res;
if (!state->alsa_recovering && (delay < target / 2 || delay > target * 2)) { if (!state->alsa_recovering && (delay < target / 2 || delay > target * 2)) {
spa_log_warn(state->log, "%s: follower delay:%lu target:%lu resync %f %f %f", spa_log_warn(state->log, "%s: follower delay:%lu target:%lu thr:%u, resync",
state->props.device, delay, target, state->dll.z1, state->props.device, delay, target, threshold);
state->dll.z2, state->dll.z3);
spa_dll_init(&state->dll); spa_dll_init(&state->dll);
state->alsa_sync = true; state->alsa_sync = true;
} }
if (state->alsa_sync) { if (state->alsa_sync) {
spa_log_warn(state->log, "%s: follower resync %ld %d %ld", spa_log_warn(state->log, "%s: follower resync delay:%ld target:%ld thr:%u",
state->props.device, delay, threshold, target); state->props.device, delay, target, threshold);
if (delay < target) if (delay < target)
snd_pcm_rewind(state->hndl, target - delay); snd_pcm_rewind(state->hndl, target - delay);
else if (delay > target) else if (delay > target)