mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-02 09:01:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

alsa: tweak dll some more after xrun

Browse source
This commit is contained in:
Wim Taymans 2018-11-19 11:51:51 +01:00
parent f063cc9086
commit 27451e4350
1 changed files with 15 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

29
spa/plugins/alsa/alsa-utils.c
View file

@ -512,6 +512,8 @@ again:
state->sample_time = state->sample_count; state->sample_time = state->sample_count;
state->sample_count += missing; state->sample_count += missing;
state->dll.t0 -= xrun * 1e-6;
#if 0 #if 0
state->safety = SPA_MIN(state->safety + 0.000333, 0.0013333); state->safety = SPA_MIN(state->safety + 0.000333, 0.0013333);
dll_bandwidth(&state->dll, DLL_BW_MAX); dll_bandwidth(&state->dll, DLL_BW_MAX);
@ -565,8 +567,8 @@ static int update_time(struct state *state, uint64_t nsec, snd_pcm_sframes_t del
/* if our buffers are too full, pause the dll */ /* if our buffers are too full, pause the dll */
if (delay >= state->threshold * 2 || elapsed == 0) { if (delay >= state->threshold * 2 || elapsed == 0) {
elapsed = state->threshold; elapsed = state->threshold / 2;
delay = state->threshold; delay = state->threshold / 2;
} }
/* we try to match the delay with the number of played samples */ /* we try to match the delay with the number of played samples */
@ -731,8 +733,6 @@ again:
} }
state->alsa_started = true; state->alsa_started = true;
} }
set_timeout(state, state->next_time);
return 0; return 0;
} }
@ -797,6 +797,7 @@ static void alsa_on_playback_timeout_event(struct spa_source *source)
struct state *state = source->data; struct state *state = source->data;
snd_pcm_sframes_t delay; snd_pcm_sframes_t delay;
uint64_t nsec, expire, elapsed; uint64_t nsec, expire, elapsed;
int64_t jitter;
if (state->started && read(state->timerfd, &expire, sizeof(uint64_t)) != sizeof(uint64_t)) if (state->started && read(state->timerfd, &expire, sizeof(uint64_t)) != sizeof(uint64_t))
spa_log_warn(state->log, "error reading timerfd: %s", strerror(errno)); spa_log_warn(state->log, "error reading timerfd: %s", strerror(errno));
@ -808,15 +809,18 @@ static void alsa_on_playback_timeout_event(struct spa_source *source)
if ((res = get_status(state, &delay)) < 0) if ((res = get_status(state, &delay)) < 0)
return; return;
spa_log_trace(state->log, "timeout %ld %d %ld", delay,
state->threshold, state->sample_count);
nsec = SPA_TIMESPEC_TO_NSEC(&state->now); nsec = SPA_TIMESPEC_TO_NSEC(&state->now);
jitter = nsec - state->next_time;
spa_log_trace(state->log, "timeout %ld %"PRIu64" %"PRIu64" %"PRIi64" %d %ld", delay,
nsec, state->next_time, jitter, state->threshold, state->sample_count);
if ((res = update_time(state, nsec, delay, &elapsed, false)) < 0) if ((res = update_time(state, nsec, delay, &elapsed, false)) < 0)
return; return;
if (delay >= state->threshold * 2) if (delay >= state->threshold * 2) {
spa_log_trace(state->log, "early wakeup %ld %d", delay, state->threshold);
goto next; goto next;
}
if (spa_list_is_empty(&state->ready)) { if (spa_list_is_empty(&state->ready)) {
struct spa_io_buffers *io = state->io; struct spa_io_buffers *io = state->io;
@ -830,13 +834,12 @@ static void alsa_on_playback_timeout_event(struct spa_source *source)
state->range->max_size = state->threshold * state->frame_size; state->range->max_size = state->threshold * state->frame_size;
} }
state->callbacks->process(state->callbacks_data, SPA_STATUS_NEED_BUFFER); state->callbacks->process(state->callbacks_data, SPA_STATUS_NEED_BUFFER);
next:
set_timeout(state, state->next_time);
} }
else { else {
spa_alsa_write(state, 0); spa_alsa_write(state, 0);
} }
next:
set_timeout(state, state->next_time);
} }
@ -943,6 +946,7 @@ int spa_alsa_start(struct state *state)
if (state->stream == SND_PCM_STREAM_PLAYBACK) { if (state->stream == SND_PCM_STREAM_PLAYBACK) {
state->alsa_started = false; state->alsa_started = false;
spa_alsa_write(state, state->threshold * 2);
} else { } else {
if ((err = snd_pcm_start(state->hndl)) < 0) { if ((err = snd_pcm_start(state->hndl)) < 0) {
spa_log_error(state->log, "snd_pcm_start: %s", snd_strerror(err)); spa_log_error(state->log, "snd_pcm_start: %s", snd_strerror(err));
@ -959,9 +963,6 @@ int spa_alsa_start(struct state *state)
ts.it_interval.tv_nsec = 0; ts.it_interval.tv_nsec = 0;
timerfd_settime(state->timerfd, 0, &ts, NULL); timerfd_settime(state->timerfd, 0, &ts, NULL);
} }
else {
spa_alsa_write(state, state->threshold * 2);
}
state->io->status = SPA_STATUS_OK; state->io->status = SPA_STATUS_OK;
state->io->buffer_id = SPA_ID_INVALID; state->io->buffer_id = SPA_ID_INVALID;