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

remap: Change remapping function argument type from void to int16_t / float as appropriate

Browse source 
Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
This commit is contained in:
Peter Meerwald 2014-04-27 22:22:03 +02:00
parent 0967f0fcdc
commit 877ad8dcf8
3 changed files with 18 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/pulsecore/remap.c
View file

@ -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 oc, ic, i;
unsigned n_ic, n_oc; 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 (oc = 0; oc < n_oc; oc++) {
for (ic = 0; ic < n_ic; ic++) { for (ic = 0; ic < n_ic; ic++) {
int16_t *d, *s; int16_t *d = dst + oc;
int32_t vol; const int16_t *s = src + ic;
int32_t vol = m->map_table_i[oc][ic];
vol = m->map_table_i[oc][ic];
if (vol <= 0) if (vol <= 0)
continue; continue;
d = (int16_t *)dst + oc;
s = (int16_t *)src + ic;
if (vol >= 0x10000) { if (vol >= 0x10000) {
for (i = n; i > 0; i--, s += n_ic, d += n_oc) for (i = n; i > 0; i--, s += n_ic, d += n_oc)
*d += *s; *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 oc, ic, i;
unsigned n_ic, n_oc; 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 (oc = 0; oc < n_oc; oc++) {
for (ic = 0; ic < n_ic; ic++) { for (ic = 0; ic < n_ic; ic++) {
float *d, *s; float *d = dst + oc;
float vol; const float *s = src + ic;
float vol = m->map_table_f[oc][ic];
vol = m->map_table_f[oc][ic];
if (vol <= 0.0f) if (vol <= 0.0f)
continue; continue;
d = (float *)dst + oc;
s = (float *)src + ic;
if (vol >= 1.0f) { if (vol >= 1.0f) {
for (i = n; i > 0; i--, s += n_ic, d += n_oc) for (i = n; i > 0; i--, s += n_ic, d += n_oc)
*d += *s; *d += *s;
@ -196,7 +188,8 @@ static void init_remap_c(pa_remap_t *m) {
} else { } else {
pa_log_info("Using generic matrix remapping"); 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);
} }
} }

7
src/pulsecore/remap_mmx.c
View file

@ -102,7 +102,7 @@
" emms \n\t" " emms \n\t"
#if defined (__i386__) || defined (__amd64__) #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; pa_reg_x86 temp, temp2;
__asm__ __volatile__ ( __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; pa_reg_x86 temp, temp2;
__asm__ __volatile__ ( __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) { m->map_table_i[0][0] == 0x10000 && m->map_table_i[1][0] == 0x10000) {
pa_log_info("Using MMX mono to stereo remapping"); 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__) */ #endif /* defined (__i386__) || defined (__amd64__) */

7
src/pulsecore/remap_sse.c
View file

@ -101,7 +101,7 @@
"4: \n\t" "4: \n\t"
#if defined (__i386__) || defined (__amd64__) #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; pa_reg_x86 temp, temp2;
__asm__ __volatile__ ( __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; pa_reg_x86 temp, temp2;
__asm__ __volatile__ ( __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) { m->map_table_i[0][0] == 0x10000 && m->map_table_i[1][0] == 0x10000) {
pa_log_info("Using SSE2 mono to stereo remapping"); 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__) */ #endif /* defined (__i386__) || defined (__amd64__) */