mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-11 13:30:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

channelmix: Improve unknown channel layout handling

Browse source 
Clamp position to valid range. so that AUX becomes UNKNOWN.
If we have one mono source channel and unknown destination, copy it
to all destination channels.
If we have one mono destination channel and unknown source layout,
average all channels.
Otherwise, pair source and dest channels.

See #538
This commit is contained in:
Wim Taymans 2021-01-15 17:51:07 +01:00
parent 376436fc2c
commit 6b0abd2057
3 changed files with 136 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

14
spa/plugins/audioconvert/channelmix.c
View file

@ -236,7 +236,7 @@ static int setup_convert(struct impl *this,
const struct spa_audio_info *info)
{
const struct spa_audio_info *src_info, *dst_info;
uint32_t i, src_chan, dst_chan;
uint32_t i, src_chan, dst_chan, p;
uint64_t src_mask, dst_mask;
int res;
@ -251,10 +251,14 @@ static int setup_convert(struct impl *this,
src_chan = src_info->info.raw.channels;
dst_chan = dst_info->info.raw.channels;
for (i = 0, src_mask = 0; i < src_chan; i++)
src_mask |= 1UL << src_info->info.raw.position[i];
for (i = 0, dst_mask = 0; i < dst_chan; i++)
dst_mask |= 1UL << dst_info->info.raw.position[i];
for (i = 0, src_mask = 0; i < src_chan; i++) {
p = src_info->info.raw.position[i];
src_mask |= 1ULL << (p < 64 ? p : 0);
}
for (i = 0, dst_mask = 0; i < dst_chan; i++) {
p = dst_info->info.raw.position[i];
dst_mask |= 1ULL << (p < 64 ? p : 0);
}
if (src_mask & 1 || src_chan == 1)
src_mask = default_mask(src_chan);