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: add default channel map when not given

Browse source
This commit is contained in:
Wim Taymans 2020-07-01 12:41:57 +02:00
parent f65d71dd5b
commit 267eabaf69
1 changed files with 38 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -190,6 +190,25 @@ static const struct def_mask default_layouts[] = {
{ 8, _M(FL) | _M(FR) | _M(RL) |_M(RR) | _M(SL) | _M(SR) | _M(FC) | _M(LFE) }, { 8, _M(FL) | _M(FR) | _M(RL) |_M(RR) | _M(SL) | _M(SR) | _M(FC) | _M(LFE) },
}; };
#define _C(ch) (SPA_AUDIO_CHANNEL_ ##ch)
struct def_map {
uint32_t channels;
uint32_t pos[SPA_AUDIO_MAX_CHANNELS];
};
static const struct def_map default_map[] = {
{ 0, { 0, } } ,
{ 1, { _C(MONO), } },
{ 2, { _C(FL), _C(FR), } },
{ 3, { _C(FL), _C(FR), _C(LFE) } },
{ 4, { _C(FL), _C(FR), _C(RL), _C(RR), } },
{ 5, { _C(FL), _C(FR), _C(RL), _C(RR), _C(FC) } },
{ 6, { _C(FL), _C(FR), _C(RL), _C(RR), _C(FC), _C(LFE), } },
{ 7, { _C(FL), _C(FR), _C(RL), _C(RR), _C(FC), _C(SL), _C(SR), } },
{ 8, { _C(FL), _C(FR), _C(RL), _C(RR), _C(FC), _C(LFE), _C(SL), _C(SR), } },
};
static enum spa_audio_channel chmap_position_to_channel(enum snd_pcm_chmap_position pos) static enum spa_audio_channel chmap_position_to_channel(enum snd_pcm_chmap_position pos)
{ {
return chmap_info[pos].channel; return chmap_info[pos].channel;
@ -344,13 +363,20 @@ spa_alsa_enum_format(struct state *state, int seq, uint32_t start, uint32_t num,
uint32_t channel; uint32_t channel;
snd_pcm_chmap_t* map; snd_pcm_chmap_t* map;
skip_channels:
if (maps[result.index] == NULL) { if (maps[result.index] == NULL) {
snd_pcm_free_chmaps(maps); snd_pcm_free_chmaps(maps);
goto enum_end; goto enum_end;
} }
map = &maps[result.index]->map; map = &maps[result.index]->map;
spa_log_debug(state->log, "map %d channels", map->channels); spa_log_debug(state->log, "map %d channels (%d %d)", map->channels, min, max);
if (map->channels < min || map->channels > max) {
result.index = result.next++;
goto skip_channels;
}
sanitize_map(map); sanitize_map(map);
spa_pod_builder_int(&b, map->channels); spa_pod_builder_int(&b, map->channels);
@ -378,6 +404,17 @@ spa_alsa_enum_format(struct state *state, int seq, uint32_t start, uint32_t num,
choice->body.type = SPA_CHOICE_Range; choice->body.type = SPA_CHOICE_Range;
} }
spa_pod_builder_pop(&b, &f[1]); spa_pod_builder_pop(&b, &f[1]);
if (min == max && min <= 8) {
const struct def_map *map = &default_map[min];
spa_pod_builder_prop(&b, SPA_FORMAT_AUDIO_position, 0);
spa_pod_builder_push_array(&b, &f[1]);
for (j = 0; j < map->channels; j++) {
spa_log_debug(state->log, NAME" %p: position %zd %d", state, j, map->pos[j]);
spa_pod_builder_id(&b, map->pos[j]);
}
spa_pod_builder_pop(&b, &f[1]);
}
} }
fmt = spa_pod_builder_pop(&b, &f[0]); fmt = spa_pod_builder_pop(&b, &f[0]);