AuroraMiddleware/AuroraOpenALSoft
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Handle the bsinc C resampler like the others

Browse Source
This commit is contained in:
Chris Robinson 2018-09-17 01:43:02 -07:00
parent 8bacb5dfb8
commit 7f4441ffbe
5 changed files with 38 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Alc/ALu.c
View File

@ -357,7 +357,7 @@ void BsincPrepare(const ALuint increment, BsincState *state, const BSincTable *t
state->sf = sf; state->sf = sf;
state->m = table->m[si]; state->m = table->m[si];
state->l = -((state->m/2) - 1); state->l = (state->m/2) - 1;
state->filter = table->Tab + table->filterOffset[si]; state->filter = table->Tab + table->filterOffset[si];
} }

79
Alc/mixer/mixer_c.c
View File

@ -9,12 +9,37 @@
#include "defs.h" #include "defs.h"
static inline ALfloat do_point(const ALfloat *restrict vals, ALsizei UNUSED(frac)) static inline ALfloat do_point(const InterpState* UNUSED(state), const ALfloat *restrict vals, ALsizei UNUSED(frac))
{ return vals[0]; } { return vals[0]; }
static inline ALfloat do_lerp(const ALfloat *restrict vals, ALsizei frac) static inline ALfloat do_lerp(const InterpState* UNUSED(state), const ALfloat *restrict vals, ALsizei frac)
{ return lerp(vals[0], vals[1], frac * (1.0f/FRACTIONONE)); } { return lerp(vals[0], vals[1], frac * (1.0f/FRACTIONONE)); }
static inline ALfloat do_cubic(const ALfloat *restrict vals, ALsizei frac) static inline ALfloat do_cubic(const InterpState* UNUSED(state), const ALfloat *restrict vals, ALsizei frac)
{ return cubic(vals[0], vals[1], vals[2], vals[3], frac * (1.0f/FRACTIONONE)); } { return cubic(vals[0], vals[1], vals[2], vals[3], frac * (1.0f/FRACTIONONE)); }
static inline ALfloat do_bsinc(const InterpState *state, const ALfloat *restrict vals, ALsizei frac)
{
const ALfloat *fil, *scd, *phd, *spd;
ALsizei j_f, pi;
ALfloat pf, r;
ASSUME(state->bsinc.m > 0);
// Calculate the phase index and factor.
#define FRAC_PHASE_BITDIFF (FRACTIONBITS-BSINC_PHASE_BITS)
pi = frac >> FRAC_PHASE_BITDIFF;
pf = (frac & ((1<<FRAC_PHASE_BITDIFF)-1)) * (1.0f/(1<<FRAC_PHASE_BITDIFF));
#undef FRAC_PHASE_BITDIFF
fil = ASSUME_ALIGNED(state->bsinc.filter + state->bsinc.m*pi*4, 16);
scd = ASSUME_ALIGNED(fil + state->bsinc.m, 16);
phd = ASSUME_ALIGNED(scd + state->bsinc.m, 16);
spd = ASSUME_ALIGNED(phd + state->bsinc.m, 16);
// Apply the scale and phase interpolated filter.
r = 0.0f;
for(j_f = 0;j_f < state->bsinc.m;j_f++)
r += (fil[j_f] + state->bsinc.sf*scd[j_f] + pf*(phd[j_f] + state->bsinc.sf*spd[j_f])) * vals[j_f];
return r;
}
const ALfloat *Resample_copy_C(const InterpState* UNUSED(state), const ALfloat *Resample_copy_C(const InterpState* UNUSED(state),
const ALfloat *restrict src, ALsizei UNUSED(frac), ALint UNUSED(increment), const ALfloat *restrict src, ALsizei UNUSED(frac), ALint UNUSED(increment),
@ -30,16 +55,19 @@ const ALfloat *Resample_copy_C(const InterpState* UNUSED(state),
} }
#define DECL_TEMPLATE(Tag, Sampler, O) \ #define DECL_TEMPLATE(Tag, Sampler, O) \
const ALfloat *Resample_##Tag##_C(const InterpState* UNUSED(state), \ const ALfloat *Resample_##Tag##_C(const InterpState *state, \
const ALfloat *restrict src, ALsizei frac, ALint increment, \ const ALfloat *restrict src, ALsizei frac, ALint increment, \
ALfloat *restrict dst, ALsizei numsamples) \ ALfloat *restrict dst, ALsizei numsamples) \
{ \ { \
const InterpState istate = *state; \
ALsizei i; \ ALsizei i; \
\ \
ASSUME(numsamples > 0); \
\
src -= O; \ src -= O; \
for(i = 0;i < numsamples;i++) \ for(i = 0;i < numsamples;i++) \
{ \ { \
dst[i] = Sampler(src, frac); \ dst[i] = Sampler(&istate, src, frac); \
\ \
frac += increment; \ frac += increment; \
src += frac>>FRACTIONBITS; \ src += frac>>FRACTIONBITS; \
@ -51,49 +79,10 @@ const ALfloat *Resample_##Tag##_C(const InterpState* UNUSED(state), \
DECL_TEMPLATE(point, do_point, 0) DECL_TEMPLATE(point, do_point, 0)
DECL_TEMPLATE(lerp, do_lerp, 0) DECL_TEMPLATE(lerp, do_lerp, 0)
DECL_TEMPLATE(cubic, do_cubic, 1) DECL_TEMPLATE(cubic, do_cubic, 1)
DECL_TEMPLATE(bsinc, do_bsinc, istate.bsinc.l)
#undef DECL_TEMPLATE #undef DECL_TEMPLATE
const ALfloat *Resample_bsinc_C(const InterpState *state, const ALfloat *restrict src,
ALsizei frac, ALint increment, ALfloat *restrict dst,
ALsizei dstlen)
{
const ALfloat *fil, *scd, *phd, *spd;
const ALfloat *const filter = state->bsinc.filter;
const ALfloat sf = state->bsinc.sf;
const ALsizei m = state->bsinc.m;
ALsizei j_f, pi, i;
ALfloat pf, r;
ASSUME(m > 0);
src += state->bsinc.l;
for(i = 0;i < dstlen;i++)
{
// Calculate the phase index and factor.
#define FRAC_PHASE_BITDIFF (FRACTIONBITS-BSINC_PHASE_BITS)
pi = frac >> FRAC_PHASE_BITDIFF;
pf = (frac & ((1<<FRAC_PHASE_BITDIFF)-1)) * (1.0f/(1<<FRAC_PHASE_BITDIFF));
#undef FRAC_PHASE_BITDIFF
fil = ASSUME_ALIGNED(filter + m*pi*4, 16);
scd = ASSUME_ALIGNED(fil + m, 16);
phd = ASSUME_ALIGNED(scd + m, 16);
spd = ASSUME_ALIGNED(phd + m, 16);
// Apply the scale and phase interpolated filter.
r = 0.0f;
for(j_f = 0;j_f < m;j_f++)
r += (fil[j_f] + sf*scd[j_f] + pf*(phd[j_f] + sf*spd[j_f])) * src[j_f];
dst[i] = r;
frac += increment;
src += frac>>FRACTIONBITS;
frac &= FRACTIONMASK;
}
return dst;
}
static inline void ApplyCoeffs(ALsizei Offset, ALfloat (*restrict Values)[2], static inline void ApplyCoeffs(ALsizei Offset, ALfloat (*restrict Values)[2],
const ALsizei IrSize, const ALsizei IrSize,

2
Alc/mixer/mixer_neon.c
View File

@ -82,7 +82,7 @@ const ALfloat *Resample_bsinc_Neon(const InterpState *state,
ASSUME(m > 0); ASSUME(m > 0);
ASSUME(dstlen > 0); ASSUME(dstlen > 0);
src += state->bsinc.l; src -= state->bsinc.l;
for(i = 0;i < dstlen;i++) for(i = 0;i < dstlen;i++)
{ {
// Calculate the phase index and factor. // Calculate the phase index and factor.

2
Alc/mixer/mixer_sse.c
View File

@ -27,7 +27,7 @@ const ALfloat *Resample_bsinc_SSE(const InterpState *state, const ALfloat *restr
ASSUME(m > 0); ASSUME(m > 0);
ASSUME(dstlen > 0); ASSUME(dstlen > 0);
src += state->bsinc.l; src -= state->bsinc.l;
for(i = 0;i < dstlen;i++) for(i = 0;i < dstlen;i++)
{ {
// Calculate the phase index and factor. // Calculate the phase index and factor.

2
OpenAL32/Include/alu.h
View File

@ -74,7 +74,7 @@ extern enum Resampler ResamplerDefault;
typedef struct BsincState { typedef struct BsincState {
ALfloat sf; /* Scale interpolation factor. */ ALfloat sf; /* Scale interpolation factor. */
ALsizei m; /* Coefficient count. */ ALsizei m; /* Coefficient count. */
ALint l; /* Left coefficient offset. */ ALsizei l; /* Left coefficient offset. */
/* Filter coefficients, followed by the scale, phase, and scale-phase /* Filter coefficients, followed by the scale, phase, and scale-phase
* delta coefficients. Starting at phase index 0, each subsequent phase * delta coefficients. Starting at phase index 0, each subsequent phase
* index follows contiguously. * index follows contiguously.