mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-06 13:29:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

resampler: Fix volume on downmix to mono

Browse source 
Patch credit: kwanghui

When downmixing to mono, we should average the signal instead of
summing it to avoid clipping.

BugLink: http://pulseaudio.org/ticket/934
BugLink: https://bugs.launchpad.net/bugs/416190

Signed-off-by: David Henningsson <david.henningsson@canonical.com>
This commit is contained in:
David Henningsson 2012-08-08 16:01:38 +02:00
parent 9887cd0a28
commit ff4af902cf
1 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/pulsecore/resampler.c
View file

@ -716,7 +716,7 @@ static void calc_map_table(pa_resampler *r) {
* *
* 2) Mono Handling: * 2) Mono Handling:
* S:Mono: Copy into all D:channels * S:Mono: Copy into all D:channels
* D:Mono: Copy in all S:channels * D:Mono: Avg all S:channels
* *
* 3) Mix D:Left, D:Right: * 3) Mix D:Left, D:Right:
* D:Left: If not connected, avg all S:Left * D:Left: If not connected, avg all S:Left
@ -759,9 +759,16 @@ static void calc_map_table(pa_resampler *r) {
* best to pass it to L+R. * best to pass it to L+R.
*/ */
if (a == b || a == PA_CHANNEL_POSITION_MONO || b == PA_CHANNEL_POSITION_MONO) { if (a == b || a == PA_CHANNEL_POSITION_MONO) {
m->map_table_f[oc][ic] = 1.0; m->map_table_f[oc][ic] = 1.0;
oc_connected = TRUE;
ic_connected[ic] = TRUE;
}
else if (b == PA_CHANNEL_POSITION_MONO) {
if (n_ic)
m->map_table_f[oc][ic] = 1.0f / (float) n_ic;
oc_connected = TRUE; oc_connected = TRUE;
ic_connected[ic] = TRUE; ic_connected[ic] = TRUE;
} }