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

channelmix: add simple upmix method

Browse source 
Add a property to select the upmix method. PSD is enabled by default
but a new simple upmixing algorithm is available that duplicates
channels and avoids lowpass filter on the FC and disables widening.

Fixes #861
This commit is contained in:
Wim Taymans 2022-03-14 15:33:07 +01:00
parent cec8898740
commit bc5b486cb9
8 changed files with 98 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -246,6 +246,16 @@ channelmix_f32_2_3p1_c(struct channelmix *mix, void * SPA_RESTRICT dst[],
for (i = 0; i < n_dst; i++)
memset(d[i], 0, n_samples * sizeof(float));
}
else if (mix->upmix == CHANNELMIX_UPMIX_SIMPLE) {
for (n = 0; n < n_samples; n++) {
float c = s[0][n] + s[1][n];
d[0][n] = s[0][n] * v0;
d[1][n] = s[1][n] * v1;
d[2][n] = c * v2;
d[3][n] = c;
}
lr4_process(&mix->lr4[3], d[3], d[3], v3, n_samples);
}
else if (v0 == 1.0f && v1 == 1.0f) {
for (n = 0; n < n_samples; n++) {
float c = s[0][n] + s[1][n];
@ -289,6 +299,18 @@ channelmix_f32_2_5p1_c(struct channelmix *mix, void * SPA_RESTRICT dst[],
for (i = 0; i < n_dst; i++)
memset(d[i], 0, n_samples * sizeof(float));
}
else if (mix->upmix == CHANNELMIX_UPMIX_SIMPLE) {
for (n = 0; n < n_samples; n++) {
float c = s[0][n] + s[1][n];
d[0][n] = s[0][n] * v0;
d[1][n] = s[1][n] * v1;
d[2][n] = c * v2;
d[3][n] = c;
d[4][n] = s[0][n] * v4;
d[5][n] = s[1][n] * v5;
}
lr4_process(&mix->lr4[3], d[3], d[3], v3, n_samples);
}
else if (v0 == 1.0f && v1 == 1.0f) {
for (n = 0; n < n_samples; n++) {
float c = s[0][n] + s[1][n];
@ -347,6 +369,20 @@ channelmix_f32_2_7p1_c(struct channelmix *mix, void * SPA_RESTRICT dst[],
for (i = 0; i < n_dst; i++)
memset(d[i], 0, n_samples * sizeof(float));
}
else if (mix->upmix == CHANNELMIX_UPMIX_SIMPLE) {
for (n = 0; n < n_samples; n++) {
float c = s[0][n] + s[1][n];
d[0][n] = s[0][n] * v0;
d[1][n] = s[1][n] * v1;
d[2][n] = c * v2;
d[3][n] = c;
d[4][n] = s[0][n] * v4;
d[5][n] = s[1][n] * v5;
d[6][n] = s[0][n] * v6;
d[7][n] = s[1][n] * v7;
}
lr4_process(&mix->lr4[3], d[3], d[3], v3, n_samples);
}
else if (v0 == 1.0f && v1 == 1.0f && v4 == 1.0f && v5 == 1.0f) {
for (n = 0; n < n_samples; n++) {
float c = s[0][n] + s[1][n];