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: only use default rate and channels when valid

Browse source 
Check the user provided rate and channels and only use them to limit the
rate and channels when they are valid.
This commit is contained in:
Wim Taymans 2025-05-08 18:16:53 +02:00
parent ff0d6d5677
commit 2d8080cbde
1 changed files with 15 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1568,21 +1568,18 @@ static int add_channels(struct state *state, bool all, uint32_t index, uint32_t
spa_log_debug(state->log, "channels (%d %d) default:%d all:%d",
min, max, state->default_channels, all);
if (min > max) {
spa_log_warn(state->log, "driver bug! min > max channels: (%d > %d)",
min, max);
SPA_SWAP(min, max);
}
if (state->default_channels != 0 && !all) {
if (min < state->default_channels)
min = state->default_channels;
if (max > state->default_channels)
max = state->default_channels;
}
min = SPA_MIN(min, SPA_AUDIO_MAX_CHANNELS);
max = SPA_MIN(max, SPA_AUDIO_MAX_CHANNELS);
if (state->default_channels != 0 && !all) {
if (min > state->default_channels ||
max < state->default_channels)
spa_log_warn(state->log, "given audio.channels %d out of range:%d-%d",
state->default_channels, min, max);
else
min = max = state->default_channels;
}
spa_pod_builder_prop(b, SPA_FORMAT_AUDIO_channels, 0);
if (state->props.use_chmap && (maps = snd_pcm_query_chmaps(hndl)) != NULL) {
@ -1853,10 +1850,12 @@ static int enum_iec958_formats(struct state *state, uint32_t index, uint32_t *ne
spa_log_debug(state->log, "rate (%d %d)", rmin, rmax);
if (state->default_rate != 0) {
if (rmin < state->default_rate)
rmin = state->default_rate;
if (rmax > state->default_rate)
rmax = state->default_rate;
if (rmin > state->default_rate ||
rmax < state->default_rate)
spa_log_warn(state->log, "given audio.rate %d out of range:%d-%d",
state->default_rate, rmin, rmax);
else
rmin = rmax = state->default_rate;
}
spa_pod_builder_prop(b, SPA_FORMAT_AUDIO_iec958Codec, 0);