diff options
| author | Chris Robinson <[email protected]> | 2014-05-19 05:46:01 -0700 |
|---|---|---|
| committer | Chris Robinson <[email protected]> | 2014-05-19 05:46:01 -0700 |
| commit | cd983245f1967e04f833acc0ec27aefa94f061b0 (patch) | |
| tree | 3bb462b9649026ac6676728d34b03f3737a8c740 /Alc/mixer_c.c | |
| parent | 8e04a8a0228aea5df0881f6b44d0fea61036d080 (diff) | |
Return a sample pointer from resamplers
Both resampling and filtering now avoid copying samples when they no-op.
Diffstat (limited to 'Alc/mixer_c.c')
| -rw-r--r-- | Alc/mixer_c.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/Alc/mixer_c.c b/Alc/mixer_c.c index 4cc76a0f..389971e0 100644 --- a/Alc/mixer_c.c +++ b/Alc/mixer_c.c @@ -15,28 +15,27 @@ static inline ALfloat lerp32(const ALfloat *vals, ALuint frac) static inline ALfloat cubic32(const ALfloat *vals, ALuint frac) { return cubic(vals[-1], vals[0], vals[1], vals[2], frac * (1.0f/FRACTIONONE)); } -void Resample_copy32_C(const ALfloat *data, ALuint UNUSED(frac), - ALuint increment, ALfloat *restrict OutBuffer, ALuint BufferSize) +const ALfloat *Resample_copy32_C(const ALfloat *data, ALuint UNUSED(frac), + ALuint increment, ALfloat *restrict UNUSED(OutBuffer), ALuint UNUSED(BufferSize)) { assert(increment==FRACTIONONE); - memcpy(OutBuffer, data, BufferSize*sizeof(ALfloat)); + return data; } #define DECL_TEMPLATE(Sampler) \ -void Resample_##Sampler##_C(const ALfloat *data, ALuint frac, \ +const ALfloat *Resample_##Sampler##_C(const ALfloat *data, ALuint frac, \ ALuint increment, ALfloat *restrict OutBuffer, ALuint BufferSize) \ { \ - ALuint pos = 0; \ ALuint i; \ - \ for(i = 0;i < BufferSize;i++) \ { \ - OutBuffer[i] = Sampler(data + pos, frac); \ + OutBuffer[i] = Sampler(data, frac); \ \ frac += increment; \ - pos += frac>>FRACTIONBITS; \ + data += frac>>FRACTIONBITS; \ frac &= FRACTIONMASK; \ } \ + return OutBuffer; \ } DECL_TEMPLATE(point32) |