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

audioconvert: skip upmix when moving channels

Browse source 
When we use SIDE for REAR, don't try to upmix REAR channels and vice
versa.
This commit is contained in:
Wim Taymans 2022-11-09 09:22:13 +01:00
parent bb24c8545d
commit 25e3144887
1 changed files with 2 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -311,6 +311,7 @@ static int make_matrix(struct channelmix *mix)
_MATRIX(SL,RL) += 1.0f; _MATRIX(SL,RL) += 1.0f;
_MATRIX(SR,RR) += 1.0f; _MATRIX(SR,RR) += 1.0f;
} }
keep &= ~SIDE;
} else if (dst_mask & STEREO) { } else if (dst_mask & STEREO) {
spa_log_debug(mix->log, "assign RL+RR to FL+FR (%f)", slev); spa_log_debug(mix->log, "assign RL+RR to FL+FR (%f)", slev);
if (matrix_encoding == MATRIX_DOLBY) { if (matrix_encoding == MATRIX_DOLBY) {
@ -348,6 +349,7 @@ static int make_matrix(struct channelmix *mix)
_MATRIX(RL,SL) += 1.0f; _MATRIX(RL,SL) += 1.0f;
_MATRIX(RR,SR) += 1.0f; _MATRIX(RR,SR) += 1.0f;
} }
keep &= ~REAR;
} else if (dst_mask & _MASK(RC)) { } else if (dst_mask & _MASK(RC)) {
spa_log_debug(mix->log, "assign SL+SR to RC (%f)", SQRT1_2); spa_log_debug(mix->log, "assign SL+SR to RC (%f)", SQRT1_2);
_MATRIX(RC,SL)+= SQRT1_2; _MATRIX(RC,SL)+= SQRT1_2;