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

remap: Split remapping functions into s16 and float implementation

Browse source 
The sample format is known when the remap structure is initialized,
no runtime decision needed.

Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
This commit is contained in:
Peter Meerwald 2014-04-16 11:58:11 +02:00 • committed by Peter Meerwald
parent 9362bdc8a1
commit c0e0e7ea8c
3 changed files with 160 additions and 158 deletions
Download patch file Download diff file Expand all files Collapse all files

208
src/pulsecore/remap.c
View file

@ -33,130 +33,107 @@
#include "remap.h" #include "remap.h"
static void remap_mono_to_stereo_c(pa_remap_t *m, void *dst, const void *src, unsigned n) { static void remap_mono_to_stereo_s16ne_c(pa_remap_t *m, int16_t *dst, const int16_t *src, unsigned n) {
unsigned i; unsigned i;
switch (m->format) { for (i = n >> 2; i; i--) {
case PA_SAMPLE_FLOAT32NE: dst[0] = dst[1] = src[0];
{ dst[2] = dst[3] = src[1];
float *d, *s; dst[4] = dst[5] = src[2];
dst[6] = dst[7] = src[3];
d = (float *) dst; src += 4;
s = (float *) src; dst += 8;
}
for (i = n >> 2; i; i--) { for (i = n & 3; i; i--) {
d[0] = d[1] = s[0]; dst[0] = dst[1] = src[0];
d[2] = d[3] = s[1]; src++;
d[4] = d[5] = s[2]; dst += 2;
d[6] = d[7] = s[3];
s += 4;
d += 8;
}
for (i = n & 3; i; i--) {
d[0] = d[1] = s[0];
s++;
d += 2;
}
break;
}
case PA_SAMPLE_S16NE:
{
int16_t *d, *s;
d = (int16_t *) dst;
s = (int16_t *) src;
for (i = n >> 2; i; i--) {
d[0] = d[1] = s[0];
d[2] = d[3] = s[1];
d[4] = d[5] = s[2];
d[6] = d[7] = s[3];
s += 4;
d += 8;
}
for (i = n & 3; i; i--) {
d[0] = d[1] = s[0];
s++;
d += 2;
}
break;
}
default:
pa_assert_not_reached();
} }
} }
static void remap_channels_matrix_c(pa_remap_t *m, void *dst, const void *src, unsigned n) { static void remap_mono_to_stereo_float32ne_c(pa_remap_t *m, float *dst, const float *src, unsigned n) {
unsigned i;
for (i = n >> 2; i; i--) {
dst[0] = dst[1] = src[0];
dst[2] = dst[3] = src[1];
dst[4] = dst[5] = src[2];
dst[6] = dst[7] = src[3];
src += 4;
dst += 8;
}
for (i = n & 3; i; i--) {
dst[0] = dst[1] = src[0];
src++;
dst += 2;
}
}
static void remap_channels_matrix_s16ne_c(pa_remap_t *m, void *dst, const void *src, unsigned n) {
unsigned oc, ic, i; unsigned oc, ic, i;
unsigned n_ic, n_oc; unsigned n_ic, n_oc;
n_ic = m->i_ss.channels; n_ic = m->i_ss.channels;
n_oc = m->o_ss.channels; n_oc = m->o_ss.channels;
switch (m->format) { memset(dst, 0, n * sizeof(int16_t) * n_oc);
case PA_SAMPLE_FLOAT32NE:
{
float *d, *s;
memset(dst, 0, n * sizeof(float) * n_oc); 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 vol;
vol = m->map_table_f[oc][ic];
if (vol <= 0.0)
continue;
d = (float *)dst + oc;
s = (float *)src + ic;
if (vol >= 1.0) {
for (i = n; i > 0; i--, s += n_ic, d += n_oc)
*d += *s;
} else {
for (i = n; i > 0; i--, s += n_ic, d += n_oc)
*d += *s * vol;
}
}
}
break;
}
case PA_SAMPLE_S16NE:
{
int16_t *d, *s; int16_t *d, *s;
int32_t vol;
memset(dst, 0, n * sizeof(int16_t) * n_oc); vol = m->map_table_i[oc][ic];
for (oc = 0; oc < n_oc; oc++) { if (vol <= 0)
continue;
for (ic = 0; ic < n_ic; ic++) { d = (int16_t *)dst + oc;
int32_t vol; s = (int16_t *)src + ic;
vol = m->map_table_i[oc][ic]; if (vol >= 0x10000) {
for (i = n; i > 0; i--, s += n_ic, d += n_oc)
if (vol <= 0) *d += *s;
continue; } else {
for (i = n; i > 0; i--, s += n_ic, d += n_oc)
d = (int16_t *)dst + oc; *d += (int16_t) (((int32_t)*s * vol) >> 16);
s = (int16_t *)src + ic; }
}
if (vol >= 0x10000) { }
for (i = n; i > 0; i--, s += n_ic, d += n_oc) }
*d += *s;
} else { static void remap_channels_matrix_float32ne_c(pa_remap_t *m, void *dst, const void *src, unsigned n) {
for (i = n; i > 0; i--, s += n_ic, d += n_oc) unsigned oc, ic, i;
*d += (int16_t) (((int32_t)*s * vol) >> 16); unsigned n_ic, n_oc;
}
} n_ic = m->i_ss.channels;
n_oc = m->o_ss.channels;
memset(dst, 0, n * sizeof(float) * n_oc);
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];
if (vol <= 0.0)
continue;
d = (float *)dst + oc;
s = (float *)src + ic;
if (vol >= 1.0) {
for (i = n; i > 0; i--, s += n_ic, d += n_oc)
*d += *s;
} else {
for (i = n; i > 0; i--, s += n_ic, d += n_oc)
*d += *s * vol;
} }
break;
} }
default:
pa_assert_not_reached();
} }
} }
@ -170,11 +147,30 @@ static void init_remap_c(pa_remap_t *m) {
/* find some common channel remappings, fall back to full matrix operation. */ /* find some common channel remappings, fall back to full matrix operation. */
if (n_ic == 1 && n_oc == 2 && if (n_ic == 1 && n_oc == 2 &&
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) {
m->do_remap = (pa_do_remap_func_t) remap_mono_to_stereo_c;
pa_log_info("Using mono to stereo remapping"); pa_log_info("Using mono to stereo remapping");
switch (m->format) {
case PA_SAMPLE_S16NE:
m->do_remap = (pa_do_remap_func_t) remap_mono_to_stereo_s16ne_c;
break;
case PA_SAMPLE_FLOAT32NE:
m->do_remap = (pa_do_remap_func_t) remap_mono_to_stereo_float32ne_c;
break;
default:
pa_assert_not_reached();
}
} else { } else {
m->do_remap = (pa_do_remap_func_t) remap_channels_matrix_c;
pa_log_info("Using generic matrix remapping"); pa_log_info("Using generic matrix remapping");
switch (m->format) {
case PA_SAMPLE_S16NE:
m->do_remap = (pa_do_remap_func_t) remap_channels_matrix_s16ne_c;
break;
case PA_SAMPLE_FLOAT32NE:
m->do_remap = (pa_do_remap_func_t) remap_channels_matrix_float32ne_c;
break;
default:
pa_assert_not_reached();
}
} }
} }

55
src/pulsecore/remap_mmx.c
View file

@ -102,33 +102,26 @@
" emms \n\t" " emms \n\t"
#if defined (__i386__) || defined (__amd64__) #if defined (__i386__) || defined (__amd64__)
static void remap_mono_to_stereo_mmx(pa_remap_t *m, void *dst, const void *src, unsigned n) { static void remap_mono_to_stereo_s16ne_mmx(pa_remap_t *m, void *dst, const void *src, unsigned n) {
pa_reg_x86 temp, temp2; pa_reg_x86 temp, temp2;
switch (m->format) { __asm__ __volatile__ (
case PA_SAMPLE_FLOAT32NE: MONO_TO_STEREO(wd,4,15) /* do words to doubles */
{ : "+r" (dst), "+r" (src), "=&r" (temp), "=&r" (temp2)
__asm__ __volatile__ ( : "r" ((pa_reg_x86)n)
MONO_TO_STEREO(dq,3,7) /* do doubles to quads */ : "cc"
: "+r" (dst), "+r" (src), "=&r" (temp), "=&r" (temp2) );
: "r" ((pa_reg_x86)n) }
: "cc"
); static void remap_mono_to_stereo_float32ne_mmx(pa_remap_t *m, void *dst, const void *src, unsigned n) {
break; pa_reg_x86 temp, temp2;
}
case PA_SAMPLE_S16NE: __asm__ __volatile__ (
{ MONO_TO_STEREO(dq,3,7) /* do doubles to quads */
__asm__ __volatile__ ( : "+r" (dst), "+r" (src), "=&r" (temp), "=&r" (temp2)
MONO_TO_STEREO(wd,4,15) /* do words to doubles */ : "r" ((pa_reg_x86)n)
: "+r" (dst), "+r" (src), "=&r" (temp), "=&r" (temp2) : "cc"
: "r" ((pa_reg_x86)n) );
: "cc"
);
break;
}
default:
pa_assert_not_reached();
}
} }
/* set the function that will execute the remapping based on the matrices */ /* set the function that will execute the remapping based on the matrices */
@ -141,8 +134,18 @@ static void init_remap_mmx(pa_remap_t *m) {
/* find some common channel remappings, fall back to full matrix operation. */ /* find some common channel remappings, fall back to full matrix operation. */
if (n_ic == 1 && n_oc == 2 && if (n_ic == 1 && n_oc == 2 &&
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) {
m->do_remap = (pa_do_remap_func_t) remap_mono_to_stereo_mmx;
pa_log_info("Using MMX mono to stereo remapping"); pa_log_info("Using MMX mono to stereo remapping");
switch (m->format) {
case PA_SAMPLE_S16NE:
m->do_remap = (pa_do_remap_func_t) remap_mono_to_stereo_s16ne_mmx;
break;
case PA_SAMPLE_FLOAT32NE:
m->do_remap = (pa_do_remap_func_t) remap_mono_to_stereo_float32ne_mmx;
break;
default:
pa_assert_not_reached();
}
} }
} }
#endif /* defined (__i386__) || defined (__amd64__) */ #endif /* defined (__i386__) || defined (__amd64__) */

55
src/pulsecore/remap_sse.c
View file

@ -101,33 +101,26 @@
"4: \n\t" "4: \n\t"
#if defined (__i386__) || defined (__amd64__) #if defined (__i386__) || defined (__amd64__)
static void remap_mono_to_stereo_sse2(pa_remap_t *m, void *dst, const void *src, unsigned n) { static void remap_mono_to_stereo_s16ne_sse2(pa_remap_t *m, void *dst, const void *src, unsigned n) {
pa_reg_x86 temp, temp2; pa_reg_x86 temp, temp2;
switch (m->format) { __asm__ __volatile__ (
case PA_SAMPLE_FLOAT32NE: MONO_TO_STEREO(wd, 5, 31) /* do words to doubles */
{ : "+r" (dst), "+r" (src), "=&r" (temp), "=&r" (temp2)
__asm__ __volatile__ ( : "r" ((pa_reg_x86)n)
MONO_TO_STEREO(dq, 4, 15) /* do doubles to quads */ : "cc"
: "+r" (dst), "+r" (src), "=&r" (temp), "=&r" (temp2) );
: "r" ((pa_reg_x86)n) }
: "cc"
); static void remap_mono_to_stereo_float32ne_sse2(pa_remap_t *m, void *dst, const void *src, unsigned n) {
break; pa_reg_x86 temp, temp2;
}
case PA_SAMPLE_S16NE: __asm__ __volatile__ (
{ MONO_TO_STEREO(dq, 4, 15) /* do doubles to quads */
__asm__ __volatile__ ( : "+r" (dst), "+r" (src), "=&r" (temp), "=&r" (temp2)
MONO_TO_STEREO(wd, 5, 31) /* do words to doubles */ : "r" ((pa_reg_x86)n)
: "+r" (dst), "+r" (src), "=&r" (temp), "=&r" (temp2) : "cc"
: "r" ((pa_reg_x86)n) );
: "cc"
);
break;
}
default:
pa_assert_not_reached();
}
} }
/* set the function that will execute the remapping based on the matrices */ /* set the function that will execute the remapping based on the matrices */
@ -140,8 +133,18 @@ static void init_remap_sse2(pa_remap_t *m) {
/* find some common channel remappings, fall back to full matrix operation. */ /* find some common channel remappings, fall back to full matrix operation. */
if (n_ic == 1 && n_oc == 2 && if (n_ic == 1 && n_oc == 2 &&
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) {
m->do_remap = (pa_do_remap_func_t) remap_mono_to_stereo_sse2;
pa_log_info("Using SSE2 mono to stereo remapping"); pa_log_info("Using SSE2 mono to stereo remapping");
switch (m->format) {
case PA_SAMPLE_S16NE:
m->do_remap = (pa_do_remap_func_t) remap_mono_to_stereo_s16ne_sse2;
break;
case PA_SAMPLE_FLOAT32NE:
m->do_remap = (pa_do_remap_func_t) remap_mono_to_stereo_float32ne_sse2;
break;
default:
pa_assert_not_reached();
}
} }
} }
#endif /* defined (__i386__) || defined (__amd64__) */ #endif /* defined (__i386__) || defined (__amd64__) */