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: Start playback when there is data

Browse source 
Do not start the playback device until there is data to play. Otherwise
time consuming configuration of other nodes (such as setting hw params
of a capture device) may be done after playback has been started, which
may cause xrun.
This commit is contained in:
Jonas Holmberg 2022-10-13 17:49:27 +02:00
parent e2638b4b68
commit 22a1e5b848
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1775,7 +1775,7 @@ recover:
state->alsa_started = false;
if (state->stream == SND_PCM_STREAM_PLAYBACK)
spa_alsa_silence(state, state->start_delay + state->threshold * 2 + state->headroom);
spa_alsa_silence(state, state->start_delay + state->threshold + state->headroom);
return do_start(state);
}
@ -2355,7 +2355,7 @@ static int handle_play(struct state *state, uint64_t current_time,
{
int res;
if (SPA_UNLIKELY(delay > target + state->max_error)) {
if (state->alsa_started && SPA_UNLIKELY(delay > target + state->max_error)) {
spa_log_trace(state->log, "%p: early wakeup %lu %lu", state, delay, target);
if (delay > target * 3)
delay = target * 3;
@ -2558,10 +2558,10 @@ int spa_alsa_start(struct state *state)
state->alsa_recovering = false;
state->alsa_started = false;
/* start capture now, playback will start after first write */
if (state->stream == SND_PCM_STREAM_PLAYBACK)
spa_alsa_silence(state, state->start_delay + state->threshold * 2 + state->headroom);
if ((err = do_start(state)) < 0)
spa_alsa_silence(state, state->start_delay + state->threshold + state->headroom);
else if ((err = do_start(state)) < 0)
return err;
set_timers(state);