From b1c2671e9dfa68c03bec124f2ead59246caf7672 Mon Sep 17 00:00:00 2001 From: Chris Robinson Date: Thu, 3 Dec 2020 23:09:23 -0800 Subject: Move the resampler declarations to a more appropriate header --- alc/voice.h | 40 ++-------------------------------------- 1 file changed, 2 insertions(+), 38 deletions(-) (limited to 'alc/voice.h') diff --git a/alc/voice.h b/alc/voice.h index bb3d5e02..8a7d12d1 100644 --- a/alc/voice.h +++ b/alc/voice.h @@ -33,44 +33,6 @@ enum class DirectMode : unsigned char { RemixMismatch }; -enum class Resampler { - Point, - Linear, - Cubic, - FastBSinc12, - BSinc12, - FastBSinc24, - BSinc24, - - Max = BSinc24 -}; -extern Resampler ResamplerDefault; - - -/* Interpolator state. Kind of a misnomer since the interpolator itself is - * stateless. This just keeps it from having to recompute scale-related - * mappings for every sample. - */ -struct BsincState { - float sf; /* Scale interpolation factor. */ - uint m; /* Coefficient count. */ - uint l; /* Left coefficient offset. */ - /* Filter coefficients, followed by the phase, scale, and scale-phase - * delta coefficients. Starting at phase index 0, each subsequent phase - * index follows contiguously. - */ - const float *filter; -}; - -union InterpState { - BsincState bsinc; -}; - -using ResamplerFunc = const float*(*)(const InterpState *state, const float *RESTRICT src, - uint frac, uint increment, const al::span dst); - -ResamplerFunc PrepareResampler(Resampler resampler, uint increment, InterpState *state); - enum { AF_None = 0, @@ -262,4 +224,6 @@ struct Voice { DEF_NEWDEL(Voice) }; +extern Resampler ResamplerDefault; + #endif /* VOICE_H */ -- cgit v1.2.3