From 877ad8dcf8d3997f65ffe8ac4f544f6bdd8952e7 Mon Sep 17 00:00:00 2001 From: Peter Meerwald Date: Sun, 27 Apr 2014 22:22:03 +0200 Subject: [PATCH] remap: Change remapping function argument type from void to int16_t / float as appropriate Signed-off-by: Peter Meerwald --- src/pulsecore/remap.c | 27 ++++++++++----------------- src/pulsecore/remap_mmx.c | 7 ++++--- src/pulsecore/remap_sse.c | 7 ++++--- 3 files changed, 18 insertions(+), 23 deletions(-) diff --git a/src/pulsecore/remap.c b/src/pulsecore/remap.c index 6bec79f2..c3de424a 100644 --- a/src/pulsecore/remap.c +++ b/src/pulsecore/remap.c @@ -69,7 +69,7 @@ static void remap_mono_to_stereo_float32ne_c(pa_remap_t *m, float *dst, const fl } } -static void remap_channels_matrix_s16ne_c(pa_remap_t *m, void *dst, const void *src, unsigned n) { +static void remap_channels_matrix_s16ne_c(pa_remap_t *m, int16_t *dst, const int16_t *src, unsigned n) { unsigned oc, ic, i; unsigned n_ic, n_oc; @@ -81,17 +81,13 @@ static void remap_channels_matrix_s16ne_c(pa_remap_t *m, void *dst, const void * for (oc = 0; oc < n_oc; oc++) { for (ic = 0; ic < n_ic; ic++) { - int16_t *d, *s; - int32_t vol; - - vol = m->map_table_i[oc][ic]; + int16_t *d = dst + oc; + const int16_t *s = src + ic; + int32_t vol = m->map_table_i[oc][ic]; if (vol <= 0) continue; - d = (int16_t *)dst + oc; - s = (int16_t *)src + ic; - if (vol >= 0x10000) { for (i = n; i > 0; i--, s += n_ic, d += n_oc) *d += *s; @@ -103,7 +99,7 @@ static void remap_channels_matrix_s16ne_c(pa_remap_t *m, void *dst, const void * } } -static void remap_channels_matrix_float32ne_c(pa_remap_t *m, void *dst, const void *src, unsigned n) { +static void remap_channels_matrix_float32ne_c(pa_remap_t *m, float *dst, const float *src, unsigned n) { unsigned oc, ic, i; unsigned n_ic, n_oc; @@ -115,17 +111,13 @@ static void remap_channels_matrix_float32ne_c(pa_remap_t *m, void *dst, const vo for (oc = 0; oc < n_oc; oc++) { for (ic = 0; ic < n_ic; ic++) { - float *d, *s; - float vol; - - vol = m->map_table_f[oc][ic]; + float *d = dst + oc; + const float *s = src + ic; + float vol = m->map_table_f[oc][ic]; if (vol <= 0.0f) continue; - d = (float *)dst + oc; - s = (float *)src + ic; - if (vol >= 1.0f) { for (i = n; i > 0; i--, s += n_ic, d += n_oc) *d += *s; @@ -196,7 +188,8 @@ static void init_remap_c(pa_remap_t *m) { } else { pa_log_info("Using generic matrix remapping"); - pa_set_remap_func(m, remap_channels_matrix_s16ne_c, remap_channels_matrix_float32ne_c); + pa_set_remap_func(m, (pa_do_remap_func_t) remap_channels_matrix_s16ne_c, + (pa_do_remap_func_t) remap_channels_matrix_float32ne_c); } } diff --git a/src/pulsecore/remap_mmx.c b/src/pulsecore/remap_mmx.c index bb81de08..51a6da7e 100644 --- a/src/pulsecore/remap_mmx.c +++ b/src/pulsecore/remap_mmx.c @@ -102,7 +102,7 @@ " emms \n\t" #if defined (__i386__) || defined (__amd64__) -static void remap_mono_to_stereo_s16ne_mmx(pa_remap_t *m, void *dst, const void *src, unsigned n) { +static void remap_mono_to_stereo_s16ne_mmx(pa_remap_t *m, int16_t *dst, const int16_t *src, unsigned n) { pa_reg_x86 temp, temp2; __asm__ __volatile__ ( @@ -113,7 +113,7 @@ static void remap_mono_to_stereo_s16ne_mmx(pa_remap_t *m, void *dst, const void ); } -static void remap_mono_to_stereo_float32ne_mmx(pa_remap_t *m, void *dst, const void *src, unsigned n) { +static void remap_mono_to_stereo_float32ne_mmx(pa_remap_t *m, float *dst, const float *src, unsigned n) { pa_reg_x86 temp, temp2; __asm__ __volatile__ ( @@ -136,7 +136,8 @@ static void init_remap_mmx(pa_remap_t *m) { m->map_table_i[0][0] == 0x10000 && m->map_table_i[1][0] == 0x10000) { pa_log_info("Using MMX mono to stereo remapping"); - pa_set_remap_func(m, remap_mono_to_stereo_s16ne_mmx, remap_mono_to_stereo_float32ne_mmx); + pa_set_remap_func(m, (pa_do_remap_func_t) remap_mono_to_stereo_s16ne_mmx, + (pa_do_remap_func_t) remap_mono_to_stereo_float32ne_mmx); } } #endif /* defined (__i386__) || defined (__amd64__) */ diff --git a/src/pulsecore/remap_sse.c b/src/pulsecore/remap_sse.c index 2c24c60b..d502eceb 100644 --- a/src/pulsecore/remap_sse.c +++ b/src/pulsecore/remap_sse.c @@ -101,7 +101,7 @@ "4: \n\t" #if defined (__i386__) || defined (__amd64__) -static void remap_mono_to_stereo_s16ne_sse2(pa_remap_t *m, void *dst, const void *src, unsigned n) { +static void remap_mono_to_stereo_s16ne_sse2(pa_remap_t *m, int16_t *dst, const int16_t *src, unsigned n) { pa_reg_x86 temp, temp2; __asm__ __volatile__ ( @@ -112,7 +112,7 @@ static void remap_mono_to_stereo_s16ne_sse2(pa_remap_t *m, void *dst, const void ); } -static void remap_mono_to_stereo_float32ne_sse2(pa_remap_t *m, void *dst, const void *src, unsigned n) { +static void remap_mono_to_stereo_float32ne_sse2(pa_remap_t *m, float *dst, const float *src, unsigned n) { pa_reg_x86 temp, temp2; __asm__ __volatile__ ( @@ -135,7 +135,8 @@ static void init_remap_sse2(pa_remap_t *m) { m->map_table_i[0][0] == 0x10000 && m->map_table_i[1][0] == 0x10000) { pa_log_info("Using SSE2 mono to stereo remapping"); - pa_set_remap_func(m, remap_mono_to_stereo_s16ne_sse2, remap_mono_to_stereo_float32ne_sse2); + pa_set_remap_func(m, (pa_do_remap_func_t) remap_mono_to_stereo_s16ne_sse2, + (pa_do_remap_func_t) remap_mono_to_stereo_float32ne_sse2); } } #endif /* defined (__i386__) || defined (__amd64__) */ -- 2.39.2