diff options
Diffstat (limited to 'Alc')
-rw-r--r-- | Alc/bformatdec.c | 4 | ||||
-rw-r--r-- | Alc/bformatdec.h | 2 | ||||
-rw-r--r-- | Alc/uhjfilter.c | 10 | ||||
-rw-r--r-- | Alc/uhjfilter.h | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/Alc/bformatdec.c b/Alc/bformatdec.c index 5556c2ef..c18376b5 100644 --- a/Alc/bformatdec.c +++ b/Alc/bformatdec.c @@ -32,11 +32,11 @@ void bandsplit_clear(BandSplitter *splitter) } void bandsplit_process(BandSplitter *splitter, ALfloat *restrict hpout, ALfloat *restrict lpout, - const ALfloat *input, ALuint count) + const ALfloat *input, ALsizei count) { ALfloat coeff, d, x; ALfloat z1, z2; - ALuint i; + ALsizei i; coeff = splitter->coeff*0.5f + 0.5f; z1 = splitter->lp_z1; diff --git a/Alc/bformatdec.h b/Alc/bformatdec.h index e78d89a7..2fd38ac5 100644 --- a/Alc/bformatdec.h +++ b/Alc/bformatdec.h @@ -44,6 +44,6 @@ typedef struct BandSplitter { void bandsplit_init(BandSplitter *splitter, ALfloat freq_mult); void bandsplit_clear(BandSplitter *splitter); void bandsplit_process(BandSplitter *splitter, ALfloat *restrict hpout, ALfloat *restrict lpout, - const ALfloat *input, ALuint count); + const ALfloat *input, ALsizei count); #endif /* BFORMATDEC_H */ diff --git a/Alc/uhjfilter.c b/Alc/uhjfilter.c index 0a702873..8e2febae 100644 --- a/Alc/uhjfilter.c +++ b/Alc/uhjfilter.c @@ -16,9 +16,9 @@ static const ALfloat Filter2Coeff[4] = { 0.4021921162426f, 0.8561710882420f, 0.9722909545651f, 0.9952884791278f }; -static void allpass_process(AllPassState *state, ALfloat *restrict dst, const ALfloat *restrict src, const ALfloat aa, ALuint todo) +static void allpass_process(AllPassState *state, ALfloat *restrict dst, const ALfloat *restrict src, const ALfloat aa, ALsizei todo) { - ALuint i; + ALsizei i; if(todo > 1) { @@ -62,15 +62,15 @@ static void allpass_process(AllPassState *state, ALfloat *restrict dst, const AL * know which is the intended result. */ -void EncodeUhj2(Uhj2Encoder *enc, ALfloat *restrict LeftOut, ALfloat *restrict RightOut, ALfloat (*restrict InSamples)[BUFFERSIZE], ALuint SamplesToDo) +void EncodeUhj2(Uhj2Encoder *enc, ALfloat *restrict LeftOut, ALfloat *restrict RightOut, ALfloat (*restrict InSamples)[BUFFERSIZE], ALsizei SamplesToDo) { ALfloat D[MAX_UPDATE_SAMPLES], S[MAX_UPDATE_SAMPLES]; ALfloat temp[2][MAX_UPDATE_SAMPLES]; - ALuint base, i; + ALsizei base, i; for(base = 0;base < SamplesToDo;) { - ALuint todo = minu(SamplesToDo - base, MAX_UPDATE_SAMPLES); + ALsizei todo = mini(SamplesToDo - base, MAX_UPDATE_SAMPLES); /* D = 0.6554516*Y */ for(i = 0;i < todo;i++) diff --git a/Alc/uhjfilter.h b/Alc/uhjfilter.h index cec3463e..48c2fde6 100644 --- a/Alc/uhjfilter.h +++ b/Alc/uhjfilter.h @@ -44,6 +44,6 @@ typedef struct Uhj2Encoder { /* Encodes a 2-channel UHJ (stereo-compatible) signal from a B-Format input * signal. The input must use FuMa channel ordering and scaling. */ -void EncodeUhj2(Uhj2Encoder *enc, ALfloat *restrict LeftOut, ALfloat *restrict RightOut, ALfloat (*restrict InSamples)[BUFFERSIZE], ALuint SamplesToDo); +void EncodeUhj2(Uhj2Encoder *enc, ALfloat *restrict LeftOut, ALfloat *restrict RightOut, ALfloat (*restrict InSamples)[BUFFERSIZE], ALsizei SamplesToDo); #endif /* UHJFILTER_H */ |