mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-12-19 08:57:14 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

alsa: use chmap by default when using UCM

Browse source 
Fixes #2648
This commit is contained in:
Wim Taymans 2024-01-25 10:26:11 +01:00
parent 65f594c6a1
commit 803c82abb9
2 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -762,6 +762,8 @@ int spa_alsa_init(struct state *state, const struct spa_dict *info)
state->card_index = atoi(s); state->card_index = atoi(s);
} else if (spa_streq(k, SPA_KEY_API_ALSA_OPEN_UCM)) { } else if (spa_streq(k, SPA_KEY_API_ALSA_OPEN_UCM)) {
state->open_ucm = spa_atob(s); state->open_ucm = spa_atob(s);
if (state->open_ucm)
state->props.use_chmap = true;
} else if (spa_streq(k, "clock.quantum-limit")) { } else if (spa_streq(k, "clock.quantum-limit")) {
spa_atou32(s, &state->quantum_limit, 0); spa_atou32(s, &state->quantum_limit, 0);
} else if (spa_streq(k, SPA_KEY_API_ALSA_BIND_CTLS)) { } else if (spa_streq(k, SPA_KEY_API_ALSA_BIND_CTLS)) {
@ -1353,6 +1355,8 @@ skip_channels:
goto skip_channels; goto skip_channels;
} }
spa_log_debug(state->log, "%p: using chmap", state);
sanitize_map(map); sanitize_map(map);
spa_pod_builder_int(b, map->channels); spa_pod_builder_int(b, map->channels);
@ -1385,10 +1389,13 @@ skip_channels:
spa_pod_builder_pop(b, &f[0]); spa_pod_builder_pop(b, &f[0]);
if (min == max) { if (min == max) {
if (state->default_pos.channels == min) if (state->default_pos.channels == min) {
map = &state->default_pos; map = &state->default_pos;
else if (min == max && min <= 8) spa_log_debug(state->log, "%p: using provided default", state);
} else if (min <= 8) {
map = &default_map[min]; map = &default_map[min];
spa_log_debug(state->log, "%p: using default %d channel map", state, min);
}
} }
if (map) { if (map) {
spa_pod_builder_prop(b, SPA_FORMAT_AUDIO_position, 0); spa_pod_builder_prop(b, SPA_FORMAT_AUDIO_position, 0);

1
spa/plugins/alsa/alsa-pcm.h
View file

@ -40,6 +40,7 @@ extern "C" {
#define DEFAULT_PERIOD 1024u #define DEFAULT_PERIOD 1024u
#define DEFAULT_RATE 48000u #define DEFAULT_RATE 48000u
#define DEFAULT_CHANNELS 2u #define DEFAULT_CHANNELS 2u
/* CHMAP defaults to true when using UCM */
#define DEFAULT_USE_CHMAP false #define DEFAULT_USE_CHMAP false
#define MAX_HTIMESTAMP_ERROR 64 #define MAX_HTIMESTAMP_ERROR 64