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

channelmix: read mix coefficients correctly

Browse source 
Fix 5p1 to stereo mixdown by reading the coefficients correctly.
Align 5p1 to quad SSE and C implementation

Fixes #272
This commit is contained in:
Wim Taymans 2020-09-02 11:15:23 +02:00
parent 613824ab0b
commit 4867edb947
2 changed files with 18 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -295,10 +295,10 @@ channelmix_f32_5p1_2_c(struct channelmix *mix, uint32_t n_dst, void * SPA_RESTRI
const float **s = (const float **) src;
const float v0 = mix->matrix[0][0];
const float v1 = mix->matrix[1][1];
const float clev = mix->matrix[2][0];
const float llev = mix->matrix[3][0];
const float slev0 = mix->matrix[4][0];
const float slev1 = mix->matrix[4][1];
const float clev = (mix->matrix[0][2] + mix->matrix[1][2]) * 0.5f;
const float llev = (mix->matrix[0][3] + mix->matrix[1][3]) * 0.5f;
const float slev0 = mix->matrix[0][4];
const float slev1 = mix->matrix[1][5];
if (mix->zero) {
memset(d[0], 0, n_samples * sizeof(float));
@ -350,8 +350,8 @@ channelmix_f32_5p1_4_c(struct channelmix *mix, uint32_t n_dst, void * SPA_RESTRI
uint32_t i, n;
float **d = (float **) dst;
const float **s = (const float **) src;
const float clev = mix->matrix[2][0];
const float llev = mix->matrix[3][0];
const float clev = mix->matrix[0][2];
const float llev = mix->matrix[0][3];
const float v0 = mix->matrix[0][0];
const float v1 = mix->matrix[1][1];
const float v4 = mix->matrix[2][4];