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

channelmix: place L-R in rear channels

Browse source 
L-R is supposed to be the ambient sound, which should sound better in
the rear channels.
This commit is contained in:
Wim Taymans 2022-03-01 10:14:07 +01:00
parent 5a307c11e1
commit 60b338d4cf
1 changed files with 28 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -290,32 +290,36 @@ channelmix_f32_2_5p1_c(struct channelmix *mix, void * SPA_RESTRICT dst[],
else if (v0 == 1.0f && v1 == 1.0f) { else if (v0 == 1.0f && v1 == 1.0f) {
for (n = 0; n < n_samples; n++) { for (n = 0; n < n_samples; n++) {
float c = s[0][n] + s[1][n]; float c = s[0][n] + s[1][n];
float m = s[0][n] - s[1][n];
d[0][n] = s[0][n]; d[0][n] = s[0][n];
d[1][n] = s[1][n]; d[1][n] = s[1][n];
d[2][n] = c; d[3][n] = c;
d[5][n] = m;
} }
lr4_process(&mix->lr4[3], d[3], d[2], v3, n_samples); lr4_process(&mix->lr4[2], d[2], d[3], v2, n_samples);
lr4_process(&mix->lr4[2], d[2], d[2], v2, n_samples); lr4_process(&mix->lr4[3], d[3], d[3], v3, n_samples);
delay_run(mix->buffer[0], &mix->pos[0], BUFFER_SIZE, mix->delay, delay_run(mix->buffer[0], &mix->pos[0], BUFFER_SIZE, mix->delay,
d[4], s[0], v4, n_samples); d[4], d[5], v4, n_samples);
delay_run(mix->buffer[1], &mix->pos[1], BUFFER_SIZE, mix->delay, delay_run(mix->buffer[1], &mix->pos[1], BUFFER_SIZE, mix->delay,
d[5], s[1], v5, n_samples); d[5], d[5], v5, n_samples);
} }
else { else {
for (n = 0; n < n_samples; n++) { for (n = 0; n < n_samples; n++) {
float c = s[0][n] + s[1][n]; float c = s[0][n] + s[1][n];
float m = s[0][n] - s[1][n];
d[0][n] = s[0][n] * v0; d[0][n] = s[0][n] * v0;
d[1][n] = s[1][n] * v1; d[1][n] = s[1][n] * v1;
d[2][n] = c; d[3][n] = c;
d[5][n] = m;
} }
lr4_process(&mix->lr4[3], d[3], d[2], v3, n_samples); lr4_process(&mix->lr4[2], d[2], d[3], v2, n_samples);
lr4_process(&mix->lr4[2], d[2], d[2], v2, n_samples); lr4_process(&mix->lr4[3], d[3], d[3], v3, n_samples);
delay_run(mix->buffer[0], &mix->pos[0], BUFFER_SIZE, mix->delay, delay_run(mix->buffer[0], &mix->pos[0], BUFFER_SIZE, mix->delay,
d[4], s[0], v4, n_samples); d[4], d[5], v4, n_samples);
delay_run(mix->buffer[1], &mix->pos[1], BUFFER_SIZE, mix->delay, delay_run(mix->buffer[1], &mix->pos[1], BUFFER_SIZE, mix->delay,
d[5], s[1], v5, n_samples); d[5], d[5], v5, n_samples);
} }
} }
@ -342,34 +346,38 @@ channelmix_f32_2_7p1_c(struct channelmix *mix, void * SPA_RESTRICT dst[],
else if (v0 == 1.0f && v1 == 1.0f && v4 == 1.0f && v5 == 1.0f) { else if (v0 == 1.0f && v1 == 1.0f && v4 == 1.0f && v5 == 1.0f) {
for (n = 0; n < n_samples; n++) { for (n = 0; n < n_samples; n++) {
float c = s[0][n] + s[1][n]; float c = s[0][n] + s[1][n];
float m = s[0][n] - s[1][n];
d[0][n] = d[4][n] = s[0][n]; d[0][n] = d[4][n] = s[0][n];
d[1][n] = d[5][n] = s[1][n]; d[1][n] = d[5][n] = s[1][n];
d[2][n] = c; d[3][n] = c;
d[7][n] = m;
} }
lr4_process(&mix->lr4[3], d[3], d[2], v3, n_samples); lr4_process(&mix->lr4[2], d[2], d[3], v2, n_samples);
lr4_process(&mix->lr4[2], d[2], d[2], v2, n_samples); lr4_process(&mix->lr4[3], d[3], d[3], v3, n_samples);
delay_run(mix->buffer[0], &mix->pos[0], BUFFER_SIZE, mix->delay, delay_run(mix->buffer[0], &mix->pos[0], BUFFER_SIZE, mix->delay,
d[6], s[0], v6, n_samples); d[6], d[7], v6, n_samples);
delay_run(mix->buffer[1], &mix->pos[1], BUFFER_SIZE, mix->delay, delay_run(mix->buffer[1], &mix->pos[1], BUFFER_SIZE, mix->delay,
d[7], s[1], v7, n_samples); d[7], d[7], v7, n_samples);
} }
else { else {
for (n = 0; n < n_samples; n++) { for (n = 0; n < n_samples; n++) {
float c = s[0][n] + s[1][n]; float c = s[0][n] + s[1][n];
float m = s[0][n] - s[1][n];
d[0][n] = s[0][n] * v0; d[0][n] = s[0][n] * v0;
d[1][n] = s[1][n] * v1; d[1][n] = s[1][n] * v1;
d[2][n] = c; d[3][n] = c;
d[4][n] = s[0][n] * v4; d[4][n] = s[0][n] * v4;
d[5][n] = s[1][n] * v5; d[5][n] = s[1][n] * v5;
d[7][n] = m;
} }
lr4_process(&mix->lr4[3], d[3], d[2], v3, n_samples); lr4_process(&mix->lr4[2], d[2], d[3], v2, n_samples);
lr4_process(&mix->lr4[2], d[2], d[2], v2, n_samples); lr4_process(&mix->lr4[3], d[3], d[3], v3, n_samples);
delay_run(mix->buffer[0], &mix->pos[0], BUFFER_SIZE, mix->delay, delay_run(mix->buffer[0], &mix->pos[0], BUFFER_SIZE, mix->delay,
d[6], s[0], v6, n_samples); d[6], d[7], v6, n_samples);
delay_run(mix->buffer[1], &mix->pos[1], BUFFER_SIZE, mix->delay, delay_run(mix->buffer[1], &mix->pos[1], BUFFER_SIZE, mix->delay,
d[7], s[1], v7, n_samples); d[7], d[7], v7, n_samples);
} }
} }