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

channelmix: normalize matrix to avoid clipping

Browse source
This commit is contained in:
Wim Taymans 2020-09-02 18:36:42 +02:00
parent b8d65895c2
commit 5dea431372
1 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -166,7 +166,6 @@ static int make_matrix(struct channelmix *mix)
float clev = SQRT1_2; float clev = SQRT1_2;
float slev = SQRT1_2; float slev = SQRT1_2;
float llev = 0.5f; float llev = 0.5f;
float max;
spa_log_debug(mix->log, "src-mask:%08"PRIx64" dst-mask:%08"PRIx64, spa_log_debug(mix->log, "src-mask:%08"PRIx64" dst-mask:%08"PRIx64,
src_mask, dst_mask); src_mask, dst_mask);
@ -329,8 +328,6 @@ static int make_matrix(struct channelmix *mix)
spa_log_warn(mix->log, "can't assign LFE"); spa_log_warn(mix->log, "can't assign LFE");
} }
} }
max = 0.0f;
for (ic = 0, i = 0; i < NUM_CHAN; i++) { for (ic = 0, i = 0; i < NUM_CHAN; i++) {
float sum = 0.0f; float sum = 0.0f;
if ((dst_mask & (1UL << (i + 2))) == 0) if ((dst_mask & (1UL << (i + 2))) == 0)
@ -341,8 +338,10 @@ static int make_matrix(struct channelmix *mix)
mix->matrix_orig[ic][jc++] = matrix[i][j]; mix->matrix_orig[ic][jc++] = matrix[i][j];
sum += fabs(matrix[i][j]); sum += fabs(matrix[i][j]);
} }
if (sum > 1.0f)
for (j = 0; j < jc; j++)
mix->matrix_orig[ic][j] /= sum;
ic++; ic++;
max = SPA_MAX(max, sum);
} }
return 0; return 0;
} }
@ -351,19 +350,17 @@ static void impl_channelmix_set_volume(struct channelmix *mix, float volume, boo
uint32_t n_channel_volumes, float *channel_volumes) uint32_t n_channel_volumes, float *channel_volumes)
{ {
float volumes[SPA_AUDIO_MAX_CHANNELS]; float volumes[SPA_AUDIO_MAX_CHANNELS];
float vol = mute ? 0.0f : volume, sum, t; float vol = mute ? 0.0f : volume, t;
uint32_t i, j; uint32_t i, j;
uint32_t src_chan = mix->src_chan; uint32_t src_chan = mix->src_chan;
uint32_t dst_chan = mix->dst_chan; uint32_t dst_chan = mix->dst_chan;
/** apply global volume to channels */ /** apply global volume to channels */
sum = 0.0;
mix->norm = true; mix->norm = true;
for (i = 0; i < n_channel_volumes; i++) { for (i = 0; i < n_channel_volumes; i++) {
volumes[i] = channel_volumes[i] * vol; volumes[i] = channel_volumes[i] * vol;
if (volumes[i] != 1.0f) if (volumes[i] != 1.0f)
mix->norm = false; mix->norm = false;
sum += volumes[i];
} }
if (n_channel_volumes == src_chan) { if (n_channel_volumes == src_chan) {