From fde3626b776ef06028c8d78e0326901a35c9ea11 Mon Sep 17 00:00:00 2001 From: Peter Meerwald Date: Wed, 16 Apr 2014 19:24:01 +0200 Subject: [PATCH] remap: Don't use PA_VOLUME_NORM remapping operates on channel contributions, not volumes Signed-off-by: Peter Meerwald --- src/pulsecore/remap.c | 2 +- src/pulsecore/remap_mmx.c | 2 +- src/pulsecore/remap_sse.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pulsecore/remap.c b/src/pulsecore/remap.c index 8585e341..da72a620 100644 --- a/src/pulsecore/remap.c +++ b/src/pulsecore/remap.c @@ -169,7 +169,7 @@ static void init_remap_c(pa_remap_t *m) { /* find some common channel remappings, fall back to full matrix operation. */ if (n_ic == 1 && n_oc == 2 && - m->map_table_i[0][0] == PA_VOLUME_NORM && m->map_table_i[1][0] == PA_VOLUME_NORM) { + m->map_table_i[0][0] == 0x10000 && m->map_table_i[1][0] == 0x10000) { m->do_remap = (pa_do_remap_func_t) remap_mono_to_stereo_c; pa_log_info("Using mono to stereo remapping"); } else { diff --git a/src/pulsecore/remap_mmx.c b/src/pulsecore/remap_mmx.c index 5b3f0f9c..bf611a1b 100644 --- a/src/pulsecore/remap_mmx.c +++ b/src/pulsecore/remap_mmx.c @@ -140,7 +140,7 @@ static void init_remap_mmx(pa_remap_t *m) { /* find some common channel remappings, fall back to full matrix operation. */ if (n_ic == 1 && n_oc == 2 && - m->map_table_i[0][0] == PA_VOLUME_NORM && m->map_table_i[1][0] == PA_VOLUME_NORM) { + m->map_table_i[0][0] == 0x10000 && m->map_table_i[1][0] == 0x10000) { m->do_remap = (pa_do_remap_func_t) remap_mono_to_stereo_mmx; pa_log_info("Using MMX mono to stereo remapping"); } diff --git a/src/pulsecore/remap_sse.c b/src/pulsecore/remap_sse.c index 88317235..f43ecb7c 100644 --- a/src/pulsecore/remap_sse.c +++ b/src/pulsecore/remap_sse.c @@ -139,7 +139,7 @@ static void init_remap_sse2(pa_remap_t *m) { /* find some common channel remappings, fall back to full matrix operation. */ if (n_ic == 1 && n_oc == 2 && - m->map_table_i[0][0] == PA_VOLUME_NORM && m->map_table_i[1][0] == PA_VOLUME_NORM) { + m->map_table_i[0][0] == 0x10000 && m->map_table_i[1][0] == 0x10000) { m->do_remap = (pa_do_remap_func_t) remap_mono_to_stereo_sse2; pa_log_info("Using SSE2 mono to stereo remapping"); } -- 2.39.2