Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-24 11:16:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added floating-point audio reverb

Browse source
This commit is contained in:
Ken Cooke 2016-07-02 07:25:04 -07:00
parent ad8f17a142
commit 941067b9d0
2 changed files with 87 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

81
libraries/audio/src/AudioReverb.cpp
View file

@ -1725,7 +1725,7 @@ void ReverbImpl::reset() {
// Public API
//
static const int REVERB_BLOCK = 1024;
static const int REVERB_BLOCK = 256;
AudioReverb::AudioReverb(float sampleRate) {
@ -1898,6 +1898,44 @@ void AudioReverb::convertOutputToInt16(float** inputs, int16_t* output, int numF
}
}
// deinterleave stereo
void AudioReverb::convertInputFromFloat(const float* input, float** outputs, int numFrames) {
int i = 0;
for (; i < numFrames - 3; i += 4) {
__m128 f0 = _mm_loadu_ps(&input[2*i + 0]);
__m128 f1 = _mm_loadu_ps(&input[2*i + 4]);
// deinterleave
_mm_storeu_ps(&outputs[0][i], _mm_shuffle_ps(f0, f1, _MM_SHUFFLE(2,0,2,0)));
_mm_storeu_ps(&outputs[1][i], _mm_shuffle_ps(f0, f1, _MM_SHUFFLE(3,1,3,1)));
}
for (; i < numFrames; i++) {
// deinterleave
outputs[0][i] = input[2*i + 0];
outputs[1][i] = input[2*i + 1];
}
}
// interleave stereo
void AudioReverb::convertOutputToFloat(float** inputs, float* output, int numFrames) {
int i = 0;
for(; i < numFrames - 3; i += 4) {
__m128 f0 = _mm_loadu_ps(&inputs[0][i]);
__m128 f1 = _mm_loadu_ps(&inputs[1][i]);
// interleave
_mm_storeu_ps(&output[2*i + 0],_mm_unpacklo_ps(f0,f1));
_mm_storeu_ps(&output[2*i + 4],_mm_unpackhi_ps(f0,f1));
}
for(; i < numFrames; i++) {
// interleave
output[2*i + 0] = inputs[0][i];
output[2*i + 1] = inputs[1][i];
}
}
#else
// convert int16_t to float, deinterleave stereo
@ -1944,6 +1982,26 @@ void AudioReverb::convertOutputToInt16(float** inputs, int16_t* output, int numF
}
}
// deinterleave stereo
void AudioReverb::convertInputFromFloat(const float* input, float** outputs, int numFrames) {
for (int i = 0; i < numFrames; i++) {
// deinterleave
outputs[0][i] = input[2*i + 0];
outputs[1][i] = input[2*i + 1];
}
}
// interleave stereo
void AudioReverb::convertOutputToFloat(float** inputs, float* output, int numFrames) {
for (int i = 0; i < numFrames; i++) {
// interleave
output[2*i + 0] = inputs[0][i];
output[2*i + 1] = inputs[1][i];
}
}
#endif
//
@ -1966,3 +2024,24 @@ void AudioReverb::render(const int16_t* input, int16_t* output, int numFrames) {
numFrames -= n;
}
}
//
// This version handles input/output as interleaved float
//
void AudioReverb::render(const float* input, float* output, int numFrames) {
while (numFrames) {
int n = MIN(numFrames, REVERB_BLOCK);
convertInputFromFloat(input, _inout, n);
_impl->process(_inout, _inout, n);
convertOutputToFloat(_inout, output, n);
input += 2 * n;
output += 2 * n;
numFrames -= n;
}
}

7
libraries/audio/src/AudioReverb.h
View file

@ -64,13 +64,20 @@ public:
// interleaved int16_t input/output
void render(const int16_t* input, int16_t* output, int numFrames);
// interleaved float input/output
void render(const float* input, float* output, int numFrames);
private:
ReverbImpl *_impl;
ReverbParameters _params;
float* _inout[2];
void convertInputFromInt16(const int16_t* input, float** outputs, int numFrames);
void convertOutputToInt16(float** inputs, int16_t* output, int numFrames);
void convertInputFromFloat(const float* input, float** outputs, int numFrames);
void convertOutputToFloat(float** inputs, float* output, int numFrames);
};
#endif // hifi_AudioReverb_h