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

channelmix: upmix disabled also disables FC and LFE generation

Browse source 
Don't generate FC and LFE when upmix is disabled.

Fixes #2266
This commit is contained in:
Wim Taymans 2022-04-03 21:18:06 +02:00
parent 64a09a73dc
commit 54f6f9293e
2 changed files with 55 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

18
spa/plugins/audioconvert/channelmix-ops.c
View file

@ -210,15 +210,17 @@ static int make_matrix(struct channelmix *mix)
unassigned = src_mask & ~dst_mask;
keep = dst_mask & ~src_mask;
if (!SPA_FLAG_IS_SET(mix->options, CHANNELMIX_OPTION_UPMIX) ||
mix->upmix == CHANNELMIX_UPMIX_NONE)
if (!SPA_FLAG_IS_SET(mix->options, CHANNELMIX_OPTION_UPMIX)) {
keep = 0;
keep |= FRONT;
if (mix->lfe_cutoff > 0.0f)
keep |= _MASK(LFE);
else
keep &= ~_MASK(LFE);
} else {
if (mix->upmix == CHANNELMIX_UPMIX_NONE)
keep = 0;
keep |= FRONT;
if (mix->lfe_cutoff > 0.0f)
keep |= _MASK(LFE);
else
keep &= ~_MASK(LFE);
}
spa_log_debug(mix->log, "unassigned downmix %08" PRIx64 " %08" PRIx64, unassigned, keep);