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

audioconvert: add delay to rear channels when upmixing

Browse source 
See #861
This commit is contained in:
Wim Taymans 2022-03-01 09:53:40 +01:00
parent d62d2764e8
commit 5a307c11e1
9 changed files with 141 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -287,15 +287,20 @@ 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 (v0 == 1.0f && v1 == 1.0f && v4 == 1.0f && v5 == 1.0f) {
else if (v0 == 1.0f && v1 == 1.0f) {
for (n = 0; n < n_samples; n++) {
float c = s[0][n] + s[1][n];
d[0][n] = d[4][n] = s[0][n];
d[1][n] = d[5][n] = s[1][n];
d[0][n] = s[0][n];
d[1][n] = s[1][n];
d[2][n] = c;
}
lr4_process(&mix->lr4[3], d[3], d[2], v3, n_samples);
lr4_process(&mix->lr4[2], d[2], d[2], v2, n_samples);
delay_run(mix->buffer[0], &mix->pos[0], BUFFER_SIZE, mix->delay,
d[4], s[0], v4, n_samples);
delay_run(mix->buffer[1], &mix->pos[1], BUFFER_SIZE, mix->delay,
d[5], s[1], v5, n_samples);
}
else {
for (n = 0; n < n_samples; n++) {
@ -303,11 +308,14 @@ channelmix_f32_2_5p1_c(struct channelmix *mix, void * SPA_RESTRICT dst[],
d[0][n] = s[0][n] * v0;
d[1][n] = s[1][n] * v1;
d[2][n] = c;
d[4][n] = s[0][n] * v4;
d[5][n] = s[1][n] * v5;
}
lr4_process(&mix->lr4[3], d[3], d[2], v3, n_samples);
lr4_process(&mix->lr4[2], d[2], d[2], v2, n_samples);
delay_run(mix->buffer[0], &mix->pos[0], BUFFER_SIZE, mix->delay,
d[4], s[0], v4, n_samples);
delay_run(mix->buffer[1], &mix->pos[1], BUFFER_SIZE, mix->delay,
d[5], s[1], v5, n_samples);
}
}
@ -331,16 +339,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 (v0 == 1.0f && v1 == 1.0f && v4 == 1.0f && v5 == 1.0f &&
v6 == 1.0f && v7 == 1.0f) {
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];
d[0][n] = d[4][n] = d[6][n] = s[0][n];
d[1][n] = d[5][n] = d[7][n] = s[1][n];
d[0][n] = d[4][n] = s[0][n];
d[1][n] = d[5][n] = s[1][n];
d[2][n] = c;
}
lr4_process(&mix->lr4[3], d[3], d[2], v3, n_samples);
lr4_process(&mix->lr4[2], d[2], d[2], v2, n_samples);
delay_run(mix->buffer[0], &mix->pos[0], BUFFER_SIZE, mix->delay,
d[6], s[0], v6, n_samples);
delay_run(mix->buffer[1], &mix->pos[1], BUFFER_SIZE, mix->delay,
d[7], s[1], v7, n_samples);
}
else {
for (n = 0; n < n_samples; n++) {
@ -350,11 +362,14 @@ channelmix_f32_2_7p1_c(struct channelmix *mix, void * SPA_RESTRICT dst[],
d[2][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[2], v3, n_samples);
lr4_process(&mix->lr4[2], d[2], d[2], v2, n_samples);
delay_run(mix->buffer[0], &mix->pos[0], BUFFER_SIZE, mix->delay,
d[6], s[0], v6, n_samples);
delay_run(mix->buffer[1], &mix->pos[1], BUFFER_SIZE, mix->delay,
d[7], s[1], v7, n_samples);
}
}