aboutsummaryrefslogtreecommitdiffstats
path: root/core/mixer
diff options
context:
space:
mode:
authorChris Robinson <chris.kcat@gmail.com>2023-02-11 04:49:30 -0800
committerChris Robinson <chris.kcat@gmail.com>2023-02-11 04:49:30 -0800
commit31a94ca564f8de584f338da3ca7221060683a927 (patch)
tree3d07c0f19553a6469af26e6a9bfd3d4286b4a990 /core/mixer
parent38a4f3a45d6416a7992644f317094d3a2e933fe6 (diff)
Always write samples to the destination when resampling
Diffstat (limited to 'core/mixer')
-rw-r--r--core/mixer/defs.h8
-rw-r--r--core/mixer/mixer_c.cpp49
-rw-r--r--core/mixer/mixer_neon.cpp20
-rw-r--r--core/mixer/mixer_sse.cpp15
-rw-r--r--core/mixer/mixer_sse2.cpp5
-rw-r--r--core/mixer/mixer_sse41.cpp5
6 files changed, 39 insertions, 63 deletions
diff --git a/core/mixer/defs.h b/core/mixer/defs.h
index 74a474fe..e02eb0b9 100644
--- a/core/mixer/defs.h
+++ b/core/mixer/defs.h
@@ -64,15 +64,15 @@ union InterpState {
BsincState bsinc;
};
-using ResamplerFunc = float*(*)(const InterpState *state, float *RESTRICT src, uint frac,
- uint increment, const al::span<float> dst);
+using ResamplerFunc = void(*)(const InterpState *state, const float *RESTRICT src, uint frac,
+ const uint increment, const al::span<float> dst);
ResamplerFunc PrepareResampler(Resampler resampler, uint increment, InterpState *state);
template<typename TypeTag, typename InstTag>
-float *Resample_(const InterpState *state, float *RESTRICT src, uint frac, uint increment,
- const al::span<float> dst);
+void Resample_(const InterpState *state, const float *RESTRICT src, uint frac,
+ const uint increment, const al::span<float> dst);
template<typename InstTag>
void Mix_(const al::span<const float> InSamples, const al::span<FloatBufferLine> OutBuffer,
diff --git a/core/mixer/mixer_c.cpp b/core/mixer/mixer_c.cpp
index 88524368..28a92ef7 100644
--- a/core/mixer/mixer_c.cpp
+++ b/core/mixer/mixer_c.cpp
@@ -11,7 +11,6 @@
#include "hrtfbase.h"
struct CTag;
-struct CopyTag;
struct PointTag;
struct LerpTag;
struct CubicTag;
@@ -87,8 +86,8 @@ inline float do_fastbsinc(const InterpState &istate, const float *RESTRICT vals,
using SamplerT = float(&)(const InterpState&, const float*RESTRICT, const uint);
template<SamplerT Sampler>
-float *DoResample(const InterpState *state, float *RESTRICT src, uint frac, uint increment,
- const al::span<float> dst)
+void DoResample(const InterpState *state, const float *RESTRICT src, uint frac,
+ const uint increment, const al::span<float> dst)
{
const InterpState istate{*state};
ASSUME(frac < MixerFracOne);
@@ -100,7 +99,6 @@ float *DoResample(const InterpState *state, float *RESTRICT src, uint frac, uint
src += frac>>MixerFracBits;
frac &= MixerFracMask;
}
- return dst.data();
}
inline void ApplyCoeffs(float2 *RESTRICT Values, const size_t IrSize, const ConstHrirSpan Coeffs,
@@ -148,42 +146,29 @@ force_inline void MixLine(const al::span<const float> InSamples, float *RESTRICT
} // namespace
template<>
-float *Resample_<CopyTag,CTag>(const InterpState*, float *RESTRICT src, uint, uint,
- const al::span<float> dst)
-{
-#if defined(HAVE_SSE) || defined(HAVE_NEON)
- /* Avoid copying the source data if it's aligned like the destination. */
- if((reinterpret_cast<intptr_t>(src)&15) == (reinterpret_cast<intptr_t>(dst.data())&15))
- return src;
-#endif
- std::copy_n(src, dst.size(), dst.begin());
- return dst.data();
-}
-
-template<>
-float *Resample_<PointTag,CTag>(const InterpState *state, float *RESTRICT src, uint frac,
- uint increment, const al::span<float> dst)
-{ return DoResample<do_point>(state, src, frac, increment, dst); }
+void Resample_<PointTag,CTag>(const InterpState *state, const float *RESTRICT src, uint frac,
+ const uint increment, const al::span<float> dst)
+{ DoResample<do_point>(state, src, frac, increment, dst); }
template<>
-float *Resample_<LerpTag,CTag>(const InterpState *state, float *RESTRICT src, uint frac,
- uint increment, const al::span<float> dst)
-{ return DoResample<do_lerp>(state, src, frac, increment, dst); }
+void Resample_<LerpTag,CTag>(const InterpState *state, const float *RESTRICT src, uint frac,
+ const uint increment, const al::span<float> dst)
+{ DoResample<do_lerp>(state, src, frac, increment, dst); }
template<>
-float *Resample_<CubicTag,CTag>(const InterpState *state, float *RESTRICT src, uint frac,
- uint increment, const al::span<float> dst)
-{ return DoResample<do_cubic>(state, src-1, frac, increment, dst); }
+void Resample_<CubicTag,CTag>(const InterpState *state, const float *RESTRICT src, uint frac,
+ const uint increment, const al::span<float> dst)
+{ DoResample<do_cubic>(state, src-1, frac, increment, dst); }
template<>
-float *Resample_<BSincTag,CTag>(const InterpState *state, float *RESTRICT src, uint frac,
- uint increment, const al::span<float> dst)
-{ return DoResample<do_bsinc>(state, src-state->bsinc.l, frac, increment, dst); }
+void Resample_<BSincTag,CTag>(const InterpState *state, const float *RESTRICT src, uint frac,
+ const uint increment, const al::span<float> dst)
+{ DoResample<do_bsinc>(state, src-state->bsinc.l, frac, increment, dst); }
template<>
-float *Resample_<FastBSincTag,CTag>(const InterpState *state, float *RESTRICT src, uint frac,
- uint increment, const al::span<float> dst)
-{ return DoResample<do_fastbsinc>(state, src-state->bsinc.l, frac, increment, dst); }
+void Resample_<FastBSincTag,CTag>(const InterpState *state, const float *RESTRICT src, uint frac,
+ const uint increment, const al::span<float> dst)
+{ DoResample<do_fastbsinc>(state, src-state->bsinc.l, frac, increment, dst); }
template<>
diff --git a/core/mixer/mixer_neon.cpp b/core/mixer/mixer_neon.cpp
index 96cdfb29..ef2936b3 100644
--- a/core/mixer/mixer_neon.cpp
+++ b/core/mixer/mixer_neon.cpp
@@ -138,8 +138,8 @@ force_inline void MixLine(const al::span<const float> InSamples, float *RESTRICT
} // namespace
template<>
-float *Resample_<LerpTag,NEONTag>(const InterpState*, float *RESTRICT src, uint frac,
- uint increment, const al::span<float> dst)
+void Resample_<LerpTag,NEONTag>(const InterpState*, const float *RESTRICT src, uint frac,
+ const uint increment, const al::span<float> dst)
{
ASSUME(frac < MixerFracOne);
@@ -189,12 +189,11 @@ float *Resample_<LerpTag,NEONTag>(const InterpState*, float *RESTRICT src, uint
frac &= MixerFracMask;
} while(--todo);
}
- return dst.data();
}
template<>
-float *Resample_<CubicTag,NEONTag>(const InterpState *state, float *RESTRICT src, uint frac,
- uint increment, const al::span<float> dst)
+void Resample_<CubicTag,NEONTag>(const InterpState *state, const float *RESTRICT src, uint frac,
+ const uint increment, const al::span<float> dst)
{
ASSUME(frac < MixerFracOne);
@@ -222,12 +221,11 @@ float *Resample_<CubicTag,NEONTag>(const InterpState *state, float *RESTRICT src
src += frac>>MixerFracBits;
frac &= MixerFracMask;
}
- return dst.data();
}
template<>
-float *Resample_<BSincTag,NEONTag>(const InterpState *state, float *RESTRICT src, uint frac,
- uint increment, const al::span<float> dst)
+void Resample_<BSincTag,NEONTag>(const InterpState *state, const float *RESTRICT src, uint frac,
+ const uint increment, const al::span<float> dst)
{
const float *const filter{state->bsinc.filter};
const float32x4_t sf4{vdupq_n_f32(state->bsinc.sf)};
@@ -270,12 +268,11 @@ float *Resample_<BSincTag,NEONTag>(const InterpState *state, float *RESTRICT src
src += frac>>MixerFracBits;
frac &= MixerFracMask;
}
- return dst.data();
}
template<>
-float *Resample_<FastBSincTag,NEONTag>(const InterpState *state, float *RESTRICT src, uint frac,
- uint increment, const al::span<float> dst)
+void Resample_<FastBSincTag,NEONTag>(const InterpState *state, const float *RESTRICT src, uint frac,
+ const uint increment, const al::span<float> dst)
{
const float *const filter{state->bsinc.filter};
const size_t m{state->bsinc.m};
@@ -313,7 +310,6 @@ float *Resample_<FastBSincTag,NEONTag>(const InterpState *state, float *RESTRICT
src += frac>>MixerFracBits;
frac &= MixerFracMask;
}
- return dst.data();
}
diff --git a/core/mixer/mixer_sse.cpp b/core/mixer/mixer_sse.cpp
index 6bbb3d3c..0aa5d5fb 100644
--- a/core/mixer/mixer_sse.cpp
+++ b/core/mixer/mixer_sse.cpp
@@ -154,8 +154,8 @@ force_inline void MixLine(const al::span<const float> InSamples, float *RESTRICT
} // namespace
template<>
-float *Resample_<CubicTag,SSETag>(const InterpState *state, float *RESTRICT src, uint frac,
- uint increment, const al::span<float> dst)
+void Resample_<CubicTag,SSETag>(const InterpState *state, const float *RESTRICT src, uint frac,
+ const uint increment, const al::span<float> dst)
{
ASSUME(frac < MixerFracOne);
@@ -184,12 +184,11 @@ float *Resample_<CubicTag,SSETag>(const InterpState *state, float *RESTRICT src,
src += frac>>MixerFracBits;
frac &= MixerFracMask;
}
- return dst.data();
}
template<>
-float *Resample_<BSincTag,SSETag>(const InterpState *state, float *RESTRICT src, uint frac,
- uint increment, const al::span<float> dst)
+void Resample_<BSincTag,SSETag>(const InterpState *state, const float *RESTRICT src, uint frac,
+ const uint increment, const al::span<float> dst)
{
const float *const filter{state->bsinc.filter};
const __m128 sf4{_mm_set1_ps(state->bsinc.sf)};
@@ -233,12 +232,11 @@ float *Resample_<BSincTag,SSETag>(const InterpState *state, float *RESTRICT src,
src += frac>>MixerFracBits;
frac &= MixerFracMask;
}
- return dst.data();
}
template<>
-float *Resample_<FastBSincTag,SSETag>(const InterpState *state, float *RESTRICT src, uint frac,
- uint increment, const al::span<float> dst)
+void Resample_<FastBSincTag,SSETag>(const InterpState *state, const float *RESTRICT src, uint frac,
+ const uint increment, const al::span<float> dst)
{
const float *const filter{state->bsinc.filter};
const size_t m{state->bsinc.m};
@@ -277,7 +275,6 @@ float *Resample_<FastBSincTag,SSETag>(const InterpState *state, float *RESTRICT
src += frac>>MixerFracBits;
frac &= MixerFracMask;
}
- return dst.data();
}
diff --git a/core/mixer/mixer_sse2.cpp b/core/mixer/mixer_sse2.cpp
index 923924db..edaaf7a1 100644
--- a/core/mixer/mixer_sse2.cpp
+++ b/core/mixer/mixer_sse2.cpp
@@ -35,8 +35,8 @@ struct LerpTag;
#endif
template<>
-float *Resample_<LerpTag,SSE2Tag>(const InterpState*, float *RESTRICT src, uint frac,
- uint increment, const al::span<float> dst)
+void Resample_<LerpTag,SSE2Tag>(const InterpState*, const float *RESTRICT src, uint frac,
+ const uint increment, const al::span<float> dst)
{
ASSUME(frac < MixerFracOne);
@@ -87,5 +87,4 @@ float *Resample_<LerpTag,SSE2Tag>(const InterpState*, float *RESTRICT src, uint
frac &= MixerFracMask;
} while(--todo);
}
- return dst.data();
}
diff --git a/core/mixer/mixer_sse41.cpp b/core/mixer/mixer_sse41.cpp
index 23994735..8ccd9fd3 100644
--- a/core/mixer/mixer_sse41.cpp
+++ b/core/mixer/mixer_sse41.cpp
@@ -36,8 +36,8 @@ struct LerpTag;
#endif
template<>
-float *Resample_<LerpTag,SSE4Tag>(const InterpState*, float *RESTRICT src, uint frac,
- uint increment, const al::span<float> dst)
+void Resample_<LerpTag,SSE4Tag>(const InterpState*, const float *RESTRICT src, uint frac,
+ const uint increment, const al::span<float> dst)
{
ASSUME(frac < MixerFracOne);
@@ -92,5 +92,4 @@ float *Resample_<LerpTag,SSE4Tag>(const InterpState*, float *RESTRICT src, uint
frac &= MixerFracMask;
} while(--todo);
}
- return dst.data();
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-01 16:29:41 +0000