aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Alc/ALu.c2
-rw-r--r--Alc/mixer/mixer_c.c79
-rw-r--r--Alc/mixer/mixer_neon.c2
-rw-r--r--Alc/mixer/mixer_sse.c2
-rw-r--r--OpenAL32/Include/alu.h2
5 files changed, 38 insertions, 49 deletions
diff --git a/Alc/ALu.c b/Alc/ALu.c
index e5203d6e..182b226f 100644
--- a/Alc/ALu.c
+++ b/Alc/ALu.c
@@ -357,7 +357,7 @@ void BsincPrepare(const ALuint increment, BsincState *state, const BSincTable *t
state->sf = sf;
state->m = table->m[si];
- state->l = -((state->m/2) - 1);
+ state->l = (state->m/2) - 1;
state->filter = table->Tab + table->filterOffset[si];
}
diff --git a/Alc/mixer/mixer_c.c b/Alc/mixer/mixer_c.c
index 25149e00..2dcd6c6b 100644
--- a/Alc/mixer/mixer_c.c
+++ b/Alc/mixer/mixer_c.c
@@ -9,12 +9,37 @@
#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]; }
-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)); }
-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)); }
+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 *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) \
-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, \
ALfloat *restrict dst, ALsizei numsamples) \
{ \
+ const InterpState istate = *state; \
ALsizei i; \
\
+ ASSUME(numsamples > 0); \
+ \
src -= O; \
for(i = 0;i < numsamples;i++) \
{ \
- dst[i] = Sampler(src, frac); \
+ dst[i] = Sampler(&istate, src, frac); \
\
frac += increment; \
src += frac>>FRACTIONBITS; \
@@ -51,49 +79,10 @@ const ALfloat *Resample_##Tag##_C(const InterpState* UNUSED(state), \
DECL_TEMPLATE(point, do_point, 0)
DECL_TEMPLATE(lerp, do_lerp, 0)
DECL_TEMPLATE(cubic, do_cubic, 1)
+DECL_TEMPLATE(bsinc, do_bsinc, istate.bsinc.l)
#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],
const ALsizei IrSize,
diff --git a/Alc/mixer/mixer_neon.c b/Alc/mixer/mixer_neon.c
index db61fd41..0b8996fd 100644
--- a/Alc/mixer/mixer_neon.c
+++ b/Alc/mixer/mixer_neon.c
@@ -82,7 +82,7 @@ const ALfloat *Resample_bsinc_Neon(const InterpState *state,
ASSUME(m > 0);
ASSUME(dstlen > 0);
- src += state->bsinc.l;
+ src -= state->bsinc.l;
for(i = 0;i < dstlen;i++)
{
// Calculate the phase index and factor.
diff --git a/Alc/mixer/mixer_sse.c b/Alc/mixer/mixer_sse.c
index d7d54993..78cf26f1 100644
--- a/Alc/mixer/mixer_sse.c
+++ b/Alc/mixer/mixer_sse.c
@@ -27,7 +27,7 @@ const ALfloat *Resample_bsinc_SSE(const InterpState *state, const ALfloat *restr
ASSUME(m > 0);
ASSUME(dstlen > 0);
- src += state->bsinc.l;
+ src -= state->bsinc.l;
for(i = 0;i < dstlen;i++)
{
// Calculate the phase index and factor.
diff --git a/OpenAL32/Include/alu.h b/OpenAL32/Include/alu.h
index c3e6ba12..8c395ded 100644
--- a/OpenAL32/Include/alu.h
+++ b/OpenAL32/Include/alu.h
@@ -74,7 +74,7 @@ extern enum Resampler ResamplerDefault;
typedef struct BsincState {
ALfloat sf; /* Scale interpolation factor. */
ALsizei m; /* Coefficient count. */
- ALint l; /* Left coefficient offset. */
+ ALsizei l; /* Left coefficient offset. */
/* Filter coefficients, followed by the scale, phase, and scale-phase
* delta coefficients. Starting at phase index 0, each subsequent phase
* index follows contiguously.
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-30 04:50:04 +0000