mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-01 22:58:50 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

acp: remove duplicate AUX channels in pa channelmap

Browse source 
The pulseaudio channel map can only hold 32 AUX channels and we reuse
them when we need more. When we find a duplicate channel, map it to the
next AUX channels.
This commit is contained in:
Wim Taymans 2021-10-18 10:53:07 +02:00
parent a475926f87
commit e1898812b2
1 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

17
spa/plugins/alsa/acp/acp.c
View file

@ -201,10 +201,22 @@ static void device_free(void *data)
pa_hashmap_free(dev->ports); pa_hashmap_free(dev->ports);
} }
static inline void channelmap_to_acp(pa_channel_map *m, uint32_t *map)
{
uint32_t i, j;
for (i = 0; i < m->channels; i++) {
map[i] = channel_pa2acp(m->map[i]);
for (j = 0; j < i; j++) {
if (map[i] == map[j])
map[i] += 32;
}
}
}
static void init_device(pa_card *impl, pa_alsa_device *dev, pa_alsa_direction_t direction, static void init_device(pa_card *impl, pa_alsa_device *dev, pa_alsa_direction_t direction,
pa_alsa_mapping *m, uint32_t index) pa_alsa_mapping *m, uint32_t index)
{ {
uint32_t i;
char **d; char **d;
dev->card = impl; dev->card = impl;
@ -219,8 +231,7 @@ static void init_device(pa_card *impl, pa_alsa_device *dev, pa_alsa_direction_t
dev->device.format.channels = m->channel_map.channels; dev->device.format.channels = m->channel_map.channels;
pa_cvolume_reset(&dev->real_volume, dev->device.format.channels); pa_cvolume_reset(&dev->real_volume, dev->device.format.channels);
pa_cvolume_reset(&dev->soft_volume, dev->device.format.channels); pa_cvolume_reset(&dev->soft_volume, dev->device.format.channels);
for (i = 0; i < m->channel_map.channels; i++) channelmap_to_acp(&m->channel_map, dev->device.format.map);
dev->device.format.map[i]= channel_pa2acp(m->channel_map.map[i]);
dev->direction = direction; dev->direction = direction;
dev->proplist = pa_proplist_new(); dev->proplist = pa_proplist_new();
pa_proplist_update(dev->proplist, PA_UPDATE_REPLACE, m->proplist); pa_proplist_update(dev->proplist, PA_UPDATE_REPLACE, m->proplist);