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

audioconvert: fix mono channel mix test

Browse source 
When we have a single MONO channel, distribute and average. Otherwise,
use the logic to do proper mixing.

Adjust the unit test accordingly.
This commit is contained in:
Wim Taymans 2021-12-09 16:51:40 +01:00
parent ce02c7d435
commit 6b34b8c44e
4 changed files with 43 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

28
spa/plugins/audioconvert/test-channelmix.c
View file

@ -68,21 +68,36 @@ static void test_mix(uint32_t src_chan, uint32_t src_mask, uint32_t dst_chan, ui
dump_matrix(&mix, coeff);
}
static void test_1_N(void)
static void test_1_N_MONO(void)
{
test_mix(1, _M(MONO), 2, _M(FL)|_M(FR),
MATRIX(0.707107, 0.707107));
MATRIX(1.0, 1.0));
test_mix(1, _M(MONO), 3, _M(FL)|_M(FR)|_M(LFE),
MATRIX(0.707107, 0.707107, 0.0));
MATRIX(1.0, 1.0, 1.0));
test_mix(1, _M(MONO), 4, _M(FL)|_M(FR)|_M(LFE)|_M(FC),
MATRIX(0.0, 0.0, 1.0, 0.0));
MATRIX(1.0, 1.0, 1.0, 1.0));
test_mix(1, _M(MONO), 4, _M(FL)|_M(FR)|_M(RL)|_M(RR),
MATRIX(0.707107, 0.707107, 0.0, 0.0));
MATRIX(1.0, 1.0, 1.0, 1.0));
test_mix(1, _M(MONO), 12, 0,
MATRIX(1.0, 1.0, 1.0, 1.0, 1.0, 1.0,
1.0, 1.0, 1.0, 1.0, 1.0, 1.0));
}
static void test_1_N_FC(void)
{
test_mix(1, _M(FC), 2, _M(FL)|_M(FR),
MATRIX(0.707107, 0.707107));
test_mix(1, _M(FC), 3, _M(FL)|_M(FR)|_M(LFE),
MATRIX(0.707107, 0.707107, 0.0));
test_mix(1, _M(FC), 4, _M(FL)|_M(FR)|_M(LFE)|_M(FC),
MATRIX(0.0, 0.0, 1.0, 0.0));
test_mix(1, _M(FC), 4, _M(FL)|_M(FR)|_M(RL)|_M(RR),
MATRIX(0.707107, 0.707107, 0.0, 0.0));
test_mix(1, _M(FC), 12, 0,
MATRIX(1.0, 1.0, 1.0, 1.0, 1.0, 1.0,
1.0, 1.0, 1.0, 1.0, 1.0, 1.0));
}
static void test_N_1(void)
{
test_mix(1, _M(MONO), 1, _M(MONO),
@ -203,7 +218,8 @@ int main(int argc, char *argv[])
{
logger.log.level = SPA_LOG_LEVEL_TRACE;
test_1_N();
test_1_N_MONO();
test_1_N_FC();
test_N_1();
test_3p1_N();
test_4_N();