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: rework the channel params

Browse source 
Avoid adding a None choice, just add one single value without a choice
when the min == max. In that case we can also add a channel position.
This commit is contained in:
Wim Taymans 2025-05-08 18:17:45 +02:00
parent 2d8080cbde
commit f068e4ba85
1 changed files with 14 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1617,23 +1617,18 @@ skip_channels:
snd_pcm_free_chmaps(maps); snd_pcm_free_chmaps(maps);
} }
else { else {
const struct channel_map *map = NULL;
struct spa_pod_choice *choice;
if (index > 0) if (index > 0)
return 0; return 0;
spa_pod_builder_push_choice(b, &f[0], SPA_CHOICE_None, 0);
choice = (struct spa_pod_choice*)spa_pod_builder_frame(b, &f[0]);
spa_pod_builder_int(b, max);
if (min != max) { if (min != max) {
spa_pod_builder_push_choice(b, &f[0], SPA_CHOICE_Range, 0);
spa_pod_builder_int(b, max);
spa_pod_builder_int(b, min); spa_pod_builder_int(b, min);
spa_pod_builder_int(b, max); spa_pod_builder_int(b, max);
choice->body.type = SPA_CHOICE_Range; spa_pod_builder_pop(b, &f[0]);
} } else {
spa_pod_builder_pop(b, &f[0]); const struct channel_map *map = NULL;
spa_pod_builder_int(b, min);
if (min == max) {
if (state->default_pos.channels == min) { if (state->default_pos.channels == min) {
map = &state->default_pos; map = &state->default_pos;
spa_log_debug(state->log, "%p: using provided default", state); spa_log_debug(state->log, "%p: using provided default", state);
@ -1641,15 +1636,15 @@ skip_channels:
map = &default_map[min]; map = &default_map[min];
spa_log_debug(state->log, "%p: using default %d channel map", state, 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); spa_pod_builder_push_array(b, &f[0]);
spa_pod_builder_push_array(b, &f[0]); for (i = 0; i < map->channels; i++) {
for (i = 0; i < map->channels; i++) { spa_log_debug(state->log, "%p: position %zd %d", state, i, map->pos[i]);
spa_log_debug(state->log, "%p: position %zd %d", state, i, map->pos[i]); spa_pod_builder_id(b, map->pos[i]);
spa_pod_builder_id(b, map->pos[i]); }
spa_pod_builder_pop(b, &f[0]);
} }
spa_pod_builder_pop(b, &f[0]);
} }
} }
return 1; return 1;