diff options
author | Chris Robinson <[email protected]> | 2019-08-26 09:16:20 -0700 |
---|---|---|
committer | Chris Robinson <[email protected]> | 2019-08-26 09:16:20 -0700 |
commit | 7dbf69afa270417c28605a265cc2ec0a7c4fc939 (patch) | |
tree | ff6af7e2f556ecace074ef1ee968f088b5de2094 /alc/effects/compressor.cpp | |
parent | 12e6dc0cced98d8d4379dbdaa922381920d32df2 (diff) |
Use a span for effect state input
Diffstat (limited to 'alc/effects/compressor.cpp')
-rw-r--r-- | alc/effects/compressor.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/alc/effects/compressor.cpp b/alc/effects/compressor.cpp index e2f644ed..176e5a58 100644 --- a/alc/effects/compressor.cpp +++ b/alc/effects/compressor.cpp @@ -51,7 +51,7 @@ struct CompressorState final : public EffectState { ALboolean deviceUpdate(const ALCdevice *device) override; void update(const ALCcontext *context, const ALeffectslot *slot, const EffectProps *props, const EffectTarget target) override; - void process(const size_t samplesToDo, const FloatBufferLine *RESTRICT samplesIn, const ALsizei numInput, const al::span<FloatBufferLine> samplesOut) override; + void process(const size_t samplesToDo, const al::span<const FloatBufferLine> samplesIn, const al::span<FloatBufferLine> samplesOut) override; DEF_NEWDEL(CompressorState) }; @@ -85,7 +85,7 @@ void CompressorState::update(const ALCcontext*, const ALeffectslot *slot, const } } -void CompressorState::process(const size_t samplesToDo, const FloatBufferLine *RESTRICT samplesIn, const ALsizei numInput, const al::span<FloatBufferLine> samplesOut) +void CompressorState::process(const size_t samplesToDo, const al::span<const FloatBufferLine> samplesIn, const al::span<FloatBufferLine> samplesOut) { for(size_t base{0u};base < samplesToDo;) { @@ -134,10 +134,10 @@ void CompressorState::process(const size_t samplesToDo, const FloatBufferLine *R mEnvFollower = env; /* Now compress the signal amplitude to output. */ - ASSUME(numInput > 0); - for(ALsizei j{0};j < numInput;j++) + auto changains = std::addressof(mGain[0]); + for(const auto &input : samplesIn) { - const ALfloat *outgains{mGain[j]}; + const ALfloat *outgains{*(changains++)}; for(FloatBufferLine &output : samplesOut) { const ALfloat gain{*(outgains++)}; @@ -145,7 +145,7 @@ void CompressorState::process(const size_t samplesToDo, const FloatBufferLine *R continue; for(size_t i{0u};i < td;i++) - output[base+i] += samplesIn[j][base+i] * gains[i] * gain; + output[base+i] += input[base+i] * gains[i] * gain; } } |