mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-31 22:25:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

alsa: refactor a bit

Browse source 
Make spa_alsa_close() do spa_alsa_pause() first and also clear the
format.
This commit is contained in:
Wim Taymans 2021-11-23 12:20:27 +01:00
parent 13923416e0
commit 25bfc9c63d
3 changed files with 9 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

7
spa/plugins/alsa/alsa-pcm-sink.c
View file

@ -644,11 +644,8 @@ static int port_set_format(void *object,
return 0; return 0;
spa_log_debug(this->log, "clear format"); spa_log_debug(this->log, "clear format");
this->card->format_ref--;
spa_alsa_pause(this);
clear_buffers(this);
spa_alsa_close(this); spa_alsa_close(this);
this->have_format = false; clear_buffers(this);
} else { } else {
struct spa_audio_info info = { 0 }; struct spa_audio_info info = { 0 };
@ -679,7 +676,6 @@ static int port_set_format(void *object,
return err; return err;
this->current_format = info; this->current_format = info;
this->have_format = true;
} }
this->info.change_mask |= SPA_NODE_CHANGE_MASK_PROPS; this->info.change_mask |= SPA_NODE_CHANGE_MASK_PROPS;
@ -1025,7 +1021,6 @@ impl_init(const struct spa_handle_factory *factory,
this->multi_rate = spa_atob(s); this->multi_rate = spa_atob(s);
} }
} }
return spa_alsa_init(this); return spa_alsa_init(this);
} }

6
spa/plugins/alsa/alsa-pcm-source.c
View file

@ -587,11 +587,8 @@ static int port_set_format(void *object,
return 0; return 0;
spa_log_debug(this->log, "clear format"); spa_log_debug(this->log, "clear format");
this->card->format_ref--;
spa_alsa_pause(this);
clear_buffers(this);
spa_alsa_close(this); spa_alsa_close(this);
this->have_format = false; clear_buffers(this);
} else { } else {
struct spa_audio_info info = { 0 }; struct spa_audio_info info = { 0 };
@ -609,7 +606,6 @@ static int port_set_format(void *object,
return err; return err;
this->current_format = info; this->current_format = info;
this->have_format = true;
} }
this->info.change_mask |= SPA_NODE_CHANGE_MASK_PROPS; this->info.change_mask |= SPA_NODE_CHANGE_MASK_PROPS;

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

@ -176,6 +176,8 @@ int spa_alsa_close(struct state *state)
if (!state->opened) if (!state->opened)
return 0; return 0;
spa_alsa_pause(state);
spa_log_info(state->log, "%p: Device '%s' closing", state, state->props.device); spa_log_info(state->log, "%p: Device '%s' closing", state, state->props.device);
if ((err = snd_pcm_close(state->hndl)) < 0) if ((err = snd_pcm_close(state->hndl)) < 0)
spa_log_warn(state->log, "%s: close failed: %s", state->props.device, spa_log_warn(state->log, "%s: close failed: %s", state->props.device,
@ -186,6 +188,10 @@ int spa_alsa_close(struct state *state)
spa_system_close(state->data_system, state->timerfd); spa_system_close(state->data_system, state->timerfd);
if (state->have_format)
state->card->format_ref--;
state->have_format = false;
state->opened = false; state->opened = false;
return err; return err;
@ -1022,6 +1028,7 @@ int spa_alsa_set_format(struct state *state, struct spa_audio_info *fmt, uint32_
else else
state->frame_size *= rchannels; state->frame_size *= rchannels;
state->have_format = true;
if (state->card->format_ref++ == 0) if (state->card->format_ref++ == 0)
state->card->rate = rrate; state->card->rate = rrate;