aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Alc/ALc.c10
-rw-r--r--Alc/mixer.c29
-rw-r--r--Alc/mixer_c.c6
-rw-r--r--Alc/mixer_defs.h6
-rw-r--r--Alc/mixer_sse2.c12
-rw-r--r--Alc/mixer_sse41.c12
-rw-r--r--OpenAL32/Include/alMain.h2
-rw-r--r--OpenAL32/Include/alu.h6
-rw-r--r--OpenAL32/alSource.c4
-rw-r--r--alsoftrc.sample2
-rw-r--r--utils/alsoft-config/mainwindow.cpp2
11 files changed, 52 insertions, 39 deletions
diff --git a/Alc/ALc.c b/Alc/ALc.c
index 20787101..fcb6504b 100644
--- a/Alc/ALc.c
+++ b/Alc/ALc.c
@@ -1009,14 +1009,18 @@ static void alc_initconfig(void)
DefaultResampler = PointResampler;
else if(strcasecmp(str, "linear") == 0)
DefaultResampler = LinearResampler;
+ else if(strcasecmp(str, "sinc4") == 0)
+ DefaultResampler = FIR4Resampler;
else if(strcasecmp(str, "cubic") == 0)
- DefaultResampler = CubicResampler;
+ {
+ ERR("Resampler option \"cubic\" is deprecated, using sinc4\n");
+ DefaultResampler = FIR4Resampler;
+ }
else
{
char *end;
-
n = strtol(str, &end, 0);
- if(*end == '\0' && (n == PointResampler || n == LinearResampler || n == CubicResampler))
+ if(*end == '\0' && (n == PointResampler || n == LinearResampler || n == FIR4Resampler))
DefaultResampler = n;
else
WARN("Invalid resampler: %s\n", str);
diff --git a/Alc/mixer.c b/Alc/mixer.c
index 93119e6a..b2bd1dce 100644
--- a/Alc/mixer.c
+++ b/Alc/mixer.c
@@ -43,7 +43,7 @@ static_assert((INT_MAX>>FRACTIONBITS)/MAX_PITCH > BUFFERSIZE,
extern inline void InitiatePositionArrays(ALuint frac, ALuint increment, ALuint *frac_arr, ALuint *pos_arr, ALuint size);
-alignas(16) ALfloat CubicLUT[FRACTIONONE][4];
+alignas(16) ALfloat ResampleCoeffs[FRACTIONONE][4];
static HrtfMixerFunc MixHrtfSamples = MixHrtf_C;
@@ -94,16 +94,16 @@ static inline ResamplerFunc SelectResampler(enum Resampler resampler)
return Resample_lerp32_SSE2;
#endif
return Resample_lerp32_C;
- case CubicResampler:
+ case FIR4Resampler:
#ifdef HAVE_SSE4_1
if((CPUCapFlags&CPU_CAP_SSE4_1))
- return Resample_cubic32_SSE41;
+ return Resample_fir4_32_SSE41;
#endif
#ifdef HAVE_SSE2
if((CPUCapFlags&CPU_CAP_SSE2))
- return Resample_cubic32_SSE2;
+ return Resample_fir4_32_SSE2;
#endif
- return Resample_cubic32_C;
+ return Resample_fir4_32_C;
case ResamplerMax:
/* Shouldn't happen */
break;
@@ -113,17 +113,26 @@ static inline ResamplerFunc SelectResampler(enum Resampler resampler)
}
+static float lanc2(float x)
+{
+ if(x == 0.0f)
+ return 1.0f;
+ if(fabsf(x) >= 2.0f)
+ return 0.0f;
+ return 2.0f*sinf(x*F_PI)*sinf(x*F_PI/2.0f) /
+ (F_PI*F_PI * x*x);
+}
+
void aluInitMixer(void)
{
ALuint i;
for(i = 0;i < FRACTIONONE;i++)
{
ALfloat mu = (ALfloat)i / FRACTIONONE;
- ALfloat mu2 = mu*mu, mu3 = mu*mu*mu;
- CubicLUT[i][0] = -0.5f*mu3 + mu2 + -0.5f*mu;
- CubicLUT[i][1] = 1.5f*mu3 + -2.5f*mu2 + 1.0f;
- CubicLUT[i][2] = -1.5f*mu3 + 2.0f*mu2 + 0.5f*mu;
- CubicLUT[i][3] = 0.5f*mu3 + -0.5f*mu2;
+ ResampleCoeffs[i][0] = lanc2(mu - -1.0f);
+ ResampleCoeffs[i][1] = lanc2(mu - 0.0f);
+ ResampleCoeffs[i][2] = lanc2(mu - 1.0f);
+ ResampleCoeffs[i][3] = lanc2(mu - 2.0f);
}
MixHrtfSamples = SelectHrtfMixer();
diff --git a/Alc/mixer_c.c b/Alc/mixer_c.c
index d06e52b4..6164eb00 100644
--- a/Alc/mixer_c.c
+++ b/Alc/mixer_c.c
@@ -12,8 +12,8 @@ static inline ALfloat point32(const ALfloat *vals, ALuint UNUSED(frac))
{ return vals[0]; }
static inline ALfloat lerp32(const ALfloat *vals, ALuint frac)
{ return lerp(vals[0], vals[1], frac * (1.0f/FRACTIONONE)); }
-static inline ALfloat cubic32(const ALfloat *vals, ALuint frac)
-{ return cubic(vals[-1], vals[0], vals[1], vals[2], frac); }
+static inline ALfloat fir4_32(const ALfloat *vals, ALuint frac)
+{ return resample_fir4(vals[-1], vals[0], vals[1], vals[2], frac); }
const ALfloat *Resample_copy32_C(const ALfloat *src, ALuint UNUSED(frac),
ALuint UNUSED(increment), ALfloat *restrict dst, ALuint numsamples)
@@ -45,7 +45,7 @@ const ALfloat *Resample_##Sampler##_C(const ALfloat *src, ALuint frac, \
DECL_TEMPLATE(point32)
DECL_TEMPLATE(lerp32)
-DECL_TEMPLATE(cubic32)
+DECL_TEMPLATE(fir4_32)
#undef DECL_TEMPLATE
diff --git a/Alc/mixer_defs.h b/Alc/mixer_defs.h
index 00176ad4..e577fafc 100644
--- a/Alc/mixer_defs.h
+++ b/Alc/mixer_defs.h
@@ -15,7 +15,7 @@ struct HrtfState;
const ALfloat *Resample_copy32_C(const ALfloat *src, ALuint frac, ALuint increment, ALfloat *restrict dst, ALuint dstlen);
const ALfloat *Resample_point32_C(const ALfloat *src, ALuint frac, ALuint increment, ALfloat *restrict dst, ALuint dstlen);
const ALfloat *Resample_lerp32_C(const ALfloat *src, ALuint frac, ALuint increment, ALfloat *restrict dst, ALuint dstlen);
-const ALfloat *Resample_cubic32_C(const ALfloat *src, ALuint frac, ALuint increment, ALfloat *restrict dst, ALuint dstlen);
+const ALfloat *Resample_fir4_32_C(const ALfloat *src, ALuint frac, ALuint increment, ALfloat *restrict dst, ALuint dstlen);
/* C mixers */
@@ -54,9 +54,9 @@ const ALfloat *Resample_lerp32_SSE2(const ALfloat *src, ALuint frac, ALuint incr
const ALfloat *Resample_lerp32_SSE41(const ALfloat *src, ALuint frac, ALuint increment,
ALfloat *restrict dst, ALuint numsamples);
-const ALfloat *Resample_cubic32_SSE2(const ALfloat *src, ALuint frac, ALuint increment,
+const ALfloat *Resample_fir4_32_SSE2(const ALfloat *src, ALuint frac, ALuint increment,
ALfloat *restrict dst, ALuint numsamples);
-const ALfloat *Resample_cubic32_SSE41(const ALfloat *src, ALuint frac, ALuint increment,
+const ALfloat *Resample_fir4_32_SSE41(const ALfloat *src, ALuint frac, ALuint increment,
ALfloat *restrict dst, ALuint numsamples);
/* Neon mixers */
diff --git a/Alc/mixer_sse2.c b/Alc/mixer_sse2.c
index 39109245..09a797c3 100644
--- a/Alc/mixer_sse2.c
+++ b/Alc/mixer_sse2.c
@@ -77,7 +77,7 @@ const ALfloat *Resample_lerp32_SSE2(const ALfloat *src, ALuint frac, ALuint incr
return dst;
}
-const ALfloat *Resample_cubic32_SSE2(const ALfloat *src, ALuint frac, ALuint increment,
+const ALfloat *Resample_fir4_32_SSE2(const ALfloat *src, ALuint frac, ALuint increment,
ALfloat *restrict dst, ALuint numsamples)
{
const __m128i increment4 = _mm_set1_epi32(increment*4);
@@ -100,10 +100,10 @@ const ALfloat *Resample_cubic32_SSE2(const ALfloat *src, ALuint frac, ALuint inc
const __m128 val1 = _mm_loadu_ps(&src[pos_.i[1]]);
const __m128 val2 = _mm_loadu_ps(&src[pos_.i[2]]);
const __m128 val3 = _mm_loadu_ps(&src[pos_.i[3]]);
- __m128 k0 = _mm_load_ps(CubicLUT[frac_.i[0]]);
- __m128 k1 = _mm_load_ps(CubicLUT[frac_.i[1]]);
- __m128 k2 = _mm_load_ps(CubicLUT[frac_.i[2]]);
- __m128 k3 = _mm_load_ps(CubicLUT[frac_.i[3]]);
+ __m128 k0 = _mm_load_ps(ResampleCoeffs[frac_.i[0]]);
+ __m128 k1 = _mm_load_ps(ResampleCoeffs[frac_.i[1]]);
+ __m128 k2 = _mm_load_ps(ResampleCoeffs[frac_.i[2]]);
+ __m128 k3 = _mm_load_ps(ResampleCoeffs[frac_.i[3]]);
__m128 out;
k0 = _mm_mul_ps(k0, val0);
@@ -130,7 +130,7 @@ const ALfloat *Resample_cubic32_SSE2(const ALfloat *src, ALuint frac, ALuint inc
for(;i < numsamples;i++)
{
- dst[i] = cubic(src[pos], src[pos+1], src[pos+2], src[pos+3], frac);
+ dst[i] = resample_fir4(src[pos], src[pos+1], src[pos+2], src[pos+3], frac);
frac += increment;
pos += frac>>FRACTIONBITS;
diff --git a/Alc/mixer_sse41.c b/Alc/mixer_sse41.c
index 1c859bc1..c85a733d 100644
--- a/Alc/mixer_sse41.c
+++ b/Alc/mixer_sse41.c
@@ -81,7 +81,7 @@ const ALfloat *Resample_lerp32_SSE41(const ALfloat *src, ALuint frac, ALuint inc
return dst;
}
-const ALfloat *Resample_cubic32_SSE41(const ALfloat *src, ALuint frac, ALuint increment,
+const ALfloat *Resample_fir4_32_SSE41(const ALfloat *src, ALuint frac, ALuint increment,
ALfloat *restrict dst, ALuint numsamples)
{
const __m128i increment4 = _mm_set1_epi32(increment*4);
@@ -104,10 +104,10 @@ const ALfloat *Resample_cubic32_SSE41(const ALfloat *src, ALuint frac, ALuint in
const __m128 val1 = _mm_loadu_ps(&src[pos_.i[1]]);
const __m128 val2 = _mm_loadu_ps(&src[pos_.i[2]]);
const __m128 val3 = _mm_loadu_ps(&src[pos_.i[3]]);
- __m128 k0 = _mm_load_ps(CubicLUT[frac_.i[0]]);
- __m128 k1 = _mm_load_ps(CubicLUT[frac_.i[1]]);
- __m128 k2 = _mm_load_ps(CubicLUT[frac_.i[2]]);
- __m128 k3 = _mm_load_ps(CubicLUT[frac_.i[3]]);
+ __m128 k0 = _mm_load_ps(ResampleCoeffs[frac_.i[0]]);
+ __m128 k1 = _mm_load_ps(ResampleCoeffs[frac_.i[1]]);
+ __m128 k2 = _mm_load_ps(ResampleCoeffs[frac_.i[2]]);
+ __m128 k3 = _mm_load_ps(ResampleCoeffs[frac_.i[3]]);
__m128 out;
k0 = _mm_mul_ps(k0, val0);
@@ -140,7 +140,7 @@ const ALfloat *Resample_cubic32_SSE41(const ALfloat *src, ALuint frac, ALuint in
for(;i < numsamples;i++)
{
- dst[i] = cubic(src[pos], src[pos+1], src[pos+2], src[pos+3], frac);
+ dst[i] = resample_fir4(src[pos], src[pos+1], src[pos+2], src[pos+3], frac);
frac += increment;
pos += frac>>FRACTIONBITS;
diff --git a/OpenAL32/Include/alMain.h b/OpenAL32/Include/alMain.h
index 9d76fcd2..7d508721 100644
--- a/OpenAL32/Include/alMain.h
+++ b/OpenAL32/Include/alMain.h
@@ -528,7 +528,7 @@ enum DistanceModel {
enum Resampler {
PointResampler,
LinearResampler,
- CubicResampler,
+ FIR4Resampler,
ResamplerMax,
};
diff --git a/OpenAL32/Include/alu.h b/OpenAL32/Include/alu.h
index f5fc9fa4..16b3e1ab 100644
--- a/OpenAL32/Include/alu.h
+++ b/OpenAL32/Include/alu.h
@@ -202,16 +202,16 @@ inline ALuint64 clampu64(ALuint64 val, ALuint64 min, ALuint64 max)
{ return minu64(max, maxu64(min, val)); }
-extern alignas(16) ALfloat CubicLUT[FRACTIONONE][4];
+extern alignas(16) ALfloat ResampleCoeffs[FRACTIONONE][4];
inline ALfloat lerp(ALfloat val1, ALfloat val2, ALfloat mu)
{
return val1 + (val2-val1)*mu;
}
-inline ALfloat cubic(ALfloat val0, ALfloat val1, ALfloat val2, ALfloat val3, ALuint frac)
+inline ALfloat resample_fir4(ALfloat val0, ALfloat val1, ALfloat val2, ALfloat val3, ALuint frac)
{
- const ALfloat *k = CubicLUT[frac];
+ const ALfloat *k = ResampleCoeffs[frac];
return k[0]*val0 + k[1]*val1 + k[2]*val2 + k[3]*val3;
}
diff --git a/OpenAL32/alSource.c b/OpenAL32/alSource.c
index 67fb45a9..aff82b5f 100644
--- a/OpenAL32/alSource.c
+++ b/OpenAL32/alSource.c
@@ -42,12 +42,12 @@ enum Resampler DefaultResampler = LinearResampler;
const ALsizei ResamplerPadding[ResamplerMax] = {
0, /* Point */
1, /* Linear */
- 2, /* Cubic */
+ 2, /* FIR4 */
};
const ALsizei ResamplerPrePadding[ResamplerMax] = {
0, /* Point */
0, /* Linear */
- 1, /* Cubic */
+ 1, /* FIR4 */
};
diff --git a/alsoftrc.sample b/alsoftrc.sample
index cc45c892..06905439 100644
--- a/alsoftrc.sample
+++ b/alsoftrc.sample
@@ -129,7 +129,7 @@
# Selects the resampler used when mixing sources. Valid values are:
# point - nearest sample, no interpolation
# linear - extrapolates samples using a linear slope between samples
-# cubic - extrapolates samples using a Catmull-Rom spline
+# sinc4 - extrapolates samples using a 4-point sinc/lanczos filter
# Specifying other values will result in using the default (linear).
#resampler = linear
diff --git a/utils/alsoft-config/mainwindow.cpp b/utils/alsoft-config/mainwindow.cpp
index bc5c6fee..a1c2fbb3 100644
--- a/utils/alsoft-config/mainwindow.cpp
+++ b/utils/alsoft-config/mainwindow.cpp
@@ -63,7 +63,7 @@ static const struct {
{ "Default", "" },
{ "Point (low quality, fast)", "point" },
{ "Linear (basic quality, fast)", "linear" },
- { "Cubic Spline (good quality)", "cubic" },
+ { "Sinc/Lanczos (good quality)", "sinc4" },
{ "", "" }
}, stereoModeList[] = {
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-01 18:45:40 +0000