diff options
| author | Chris Robinson <[email protected]> | 2019-05-29 20:45:33 -0700 |
|---|---|---|
| committer | Chris Robinson <[email protected]> | 2019-05-29 20:45:33 -0700 |
| commit | 8af7b4c6e0ddaf4d66455702a7ede0c9036f3825 (patch) | |
| tree | 9df078b080f990aa692163f8b832d3098e4d09da /Alc/effects | |
| parent | 7e6b6d7ad90f95fc95efefe7cdf996b8e2cb90fb (diff) | |
Use FloatBufferLine and span<> for MixRowSamples
Diffstat (limited to 'Alc/effects')
| -rw-r--r-- | Alc/effects/reverb.cpp | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/Alc/effects/reverb.cpp b/Alc/effects/reverb.cpp index 1c9e72c0..74c9d3fc 100644 --- a/Alc/effects/reverb.cpp +++ b/Alc/effects/reverb.cpp @@ -391,9 +391,7 @@ struct ReverbState final : public EffectState { for(ALsizei c{0};c < NUM_LINES;c++) { std::fill_n(mTempSamples[0].begin(), todo, 0.0f); - MixRowSamples(mTempSamples[0].data(), A2B[c], - &reinterpret_cast<const ALfloat(&)[BUFFERSIZE]>(mEarlyBuffer[0]), NUM_LINES, 0, - todo); + MixRowSamples(mTempSamples[0], A2B[c], mEarlyBuffer, 0, todo); MixSamples(mTempSamples[0].data(), numOutput, &reinterpret_cast<ALfloat(&)[BUFFERSIZE]>(samplesOut[0]), mEarly.CurrentGain[c], mEarly.PanGain[c], todo, 0, todo); @@ -402,9 +400,7 @@ struct ReverbState final : public EffectState { for(ALsizei c{0};c < NUM_LINES;c++) { std::fill_n(mTempSamples[0].begin(), todo, 0.0f); - MixRowSamples(mTempSamples[0].data(), A2B[c], - &reinterpret_cast<const ALfloat(&)[BUFFERSIZE]>(mLateBuffer[0]), NUM_LINES, 0, - todo); + MixRowSamples(mTempSamples[0], A2B[c], mLateBuffer, 0, todo); MixSamples(mTempSamples[0].data(), numOutput, &reinterpret_cast<ALfloat(&)[BUFFERSIZE]>(samplesOut[0]), mLate.CurrentGain[c], mLate.PanGain[c], todo, 0, todo); @@ -418,9 +414,7 @@ struct ReverbState final : public EffectState { for(ALsizei c{0};c < NUM_LINES;c++) { std::fill_n(mTempSamples[0].begin(), todo, 0.0f); - MixRowSamples(mTempSamples[0].data(), A2B[c], - &reinterpret_cast<const ALfloat(&)[BUFFERSIZE]>(mEarlyBuffer[0]), NUM_LINES, 0, - todo); + MixRowSamples(mTempSamples[0], A2B[c], mEarlyBuffer, 0, todo); /* Apply scaling to the B-Format's HF response to "upsample" it to * higher-order output. @@ -436,9 +430,7 @@ struct ReverbState final : public EffectState { for(ALsizei c{0};c < NUM_LINES;c++) { std::fill_n(mTempSamples[0].begin(), todo, 0.0f); - MixRowSamples(mTempSamples[0].data(), A2B[c], - &reinterpret_cast<const ALfloat(&)[BUFFERSIZE]>(mLateBuffer[0]), NUM_LINES, 0, - todo); + MixRowSamples(mTempSamples[0], A2B[c], mLateBuffer, 0, todo); const ALfloat hfscale{(c==0) ? mOrderScales[0] : mOrderScales[1]}; mAmbiSplitter[1][c].applyHfScale(mTempSamples[0].data(), hfscale, todo); @@ -1465,9 +1457,7 @@ void ReverbState::process(const ALsizei samplesToDo, const FloatBufferLine *REST for(ALsizei c{0};c < NUM_LINES;c++) { std::fill_n(afmt[c].begin(), samplesToDo, 0.0f); - MixRowSamples(afmt[c].data(), B2A[c], - &reinterpret_cast<const ALfloat(&)[BUFFERSIZE]>(samplesIn[0]), numInput, 0, - samplesToDo); + MixRowSamples(afmt[c], B2A[c], {samplesIn, samplesIn+numInput}, 0, samplesToDo); /* Band-pass the incoming samples. */ mFilter[c].Lp.process(afmt[c].data(), afmt[c].data(), samplesToDo); |