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

alsa: do not ignore rate change when stream is already created

Browse source 
gstreamer alsasink can change sample while stream is already created.
In that case, gstreamer calls snd_pcm_ioplug_callback_t::stop,
snd_pcm_ioplug_callback_t::hw_params and snd_pcm_ioplug_callback_t::prepare

Add new flag to the snd_pcm_pipewire_t that is set every time
snd_pcm_pipewire_hw_params is called to prevent using stream with old
sample rate

Signed-off-by: Martin Geier <martin.geier@streamunlimited.com>
This commit is contained in:
Martin Geier 2021-11-02 14:46:10 +01:00 committed by Wim Taymans
parent a7d238ed59
commit 1b96142903
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pipewire-alsa/alsa-plugins/pcm_pipewire.c
View file

@ -68,6 +68,7 @@ typedef struct {
unsigned int drained:1;
unsigned int draining:1;
unsigned int xrun_detected:1;
unsigned int hw_params_changed:1;
snd_pcm_uframes_t hw_ptr;
snd_pcm_uframes_t boundary;
@ -495,8 +496,9 @@ static int snd_pcm_pipewire_prepare(snd_pcm_ioplug_t *io)
pw_log_debug("%p: prepare %d %p %lu %ld", pw,
pw->error, pw->stream, io->period_size, pw->min_avail);
if (pw->error >= 0 && pw->stream != NULL)
if (pw->error >= 0 && pw->stream != NULL && !pw->hw_params_changed)
goto done;
pw->hw_params_changed = false;
if (pw->stream != NULL) {
pw_stream_destroy(pw->stream);
@ -717,6 +719,7 @@ static int snd_pcm_pipewire_hw_params(snd_pcm_ioplug_t * io,
pw->blocks = 1;
pw->stride = (io->channels * pw->sample_bits) / 8;
}
pw->hw_params_changed = true;
pw_log_info("%p: format:%s channels:%d rate:%d stride:%d blocks:%d", pw,
spa_debug_type_find_name(spa_type_audio_format, pw->format.format),
io->channels, io->rate, pw->stride, pw->blocks);