Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-23 13:44:32 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

PR feedback: better naming of convertInput() and convertOutput()

Browse source
This commit is contained in:
Ken Cooke 2016-07-03 11:40:32 -07:00
parent f7c9957bb1
commit 014f6fa259
2 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1804,7 +1804,7 @@ void AudioReverb::render(float** inputs, float** outputs, int numFrames) {
#include <emmintrin.h> #include <emmintrin.h>
// convert int16_t to float, deinterleave stereo // convert int16_t to float, deinterleave stereo
void AudioReverb::convertInputFromInt16(const int16_t* input, float** outputs, int numFrames) { void AudioReverb::convertInput(const int16_t* input, float** outputs, int numFrames) {
__m128 scale = _mm_set1_ps(1/32768.0f); __m128 scale = _mm_set1_ps(1/32768.0f);
int i = 0; int i = 0;
@ -1855,8 +1855,8 @@ static inline __m128 dither4() {
return _mm_mul_ps(d0, _mm_set1_ps(1/65536.0f)); return _mm_mul_ps(d0, _mm_set1_ps(1/65536.0f));
} }
// convert float to int16_t, interleave stereo // convert float to int16_t with dither, interleave stereo
void AudioReverb::convertOutputToInt16(float** inputs, int16_t* output, int numFrames) { void AudioReverb::convertOutput(float** inputs, int16_t* output, int numFrames) {
__m128 scale = _mm_set1_ps(32768.0f); __m128 scale = _mm_set1_ps(32768.0f);
int i = 0; int i = 0;
@ -1899,7 +1899,7 @@ void AudioReverb::convertOutputToInt16(float** inputs, int16_t* output, int numF
} }
// deinterleave stereo // deinterleave stereo
void AudioReverb::convertInputFromFloat(const float* input, float** outputs, int numFrames) { void AudioReverb::convertInput(const float* input, float** outputs, int numFrames) {
int i = 0; int i = 0;
for (; i < numFrames - 3; i += 4) { for (; i < numFrames - 3; i += 4) {
@ -1918,7 +1918,7 @@ void AudioReverb::convertInputFromFloat(const float* input, float** outputs, int
} }
// interleave stereo // interleave stereo
void AudioReverb::convertOutputToFloat(float** inputs, float* output, int numFrames) { void AudioReverb::convertOutput(float** inputs, float* output, int numFrames) {
int i = 0; int i = 0;
for(; i < numFrames - 3; i += 4) { for(; i < numFrames - 3; i += 4) {
@ -1939,7 +1939,7 @@ void AudioReverb::convertOutputToFloat(float** inputs, float* output, int numFra
#else #else
// convert int16_t to float, deinterleave stereo // convert int16_t to float, deinterleave stereo
void AudioReverb::convertInputFromInt16(const int16_t* input, float** outputs, int numFrames) { void AudioReverb::convertInput(const int16_t* input, float** outputs, int numFrames) {
const float scale = 1/32768.0f; const float scale = 1/32768.0f;
for (int i = 0; i < numFrames; i++) { for (int i = 0; i < numFrames; i++) {
@ -1957,8 +1957,8 @@ static inline float dither() {
return (int32_t)(r0 - r1) * (1/65536.0f); return (int32_t)(r0 - r1) * (1/65536.0f);
} }
// convert float to int16_t, interleave stereo // convert float to int16_t with dither, interleave stereo
void AudioReverb::convertOutputToInt16(float** inputs, int16_t* output, int numFrames) { void AudioReverb::convertOutput(float** inputs, int16_t* output, int numFrames) {
const float scale = 32768.0f; const float scale = 32768.0f;
for (int i = 0; i < numFrames; i++) { for (int i = 0; i < numFrames; i++) {
@ -1983,7 +1983,7 @@ void AudioReverb::convertOutputToInt16(float** inputs, int16_t* output, int numF
} }
// deinterleave stereo // deinterleave stereo
void AudioReverb::convertInputFromFloat(const float* input, float** outputs, int numFrames) { void AudioReverb::convertInput(const float* input, float** outputs, int numFrames) {
for (int i = 0; i < numFrames; i++) { for (int i = 0; i < numFrames; i++) {
// deinterleave // deinterleave
@ -1993,7 +1993,7 @@ void AudioReverb::convertInputFromFloat(const float* input, float** outputs, int
} }
// interleave stereo // interleave stereo
void AudioReverb::convertOutputToFloat(float** inputs, float* output, int numFrames) { void AudioReverb::convertOutput(float** inputs, float* output, int numFrames) {
for (int i = 0; i < numFrames; i++) { for (int i = 0; i < numFrames; i++) {
// interleave // interleave
@ -2013,11 +2013,11 @@ void AudioReverb::render(const int16_t* input, int16_t* output, int numFrames) {
int n = MIN(numFrames, REVERB_BLOCK); int n = MIN(numFrames, REVERB_BLOCK);
convertInputFromInt16(input, _inout, n); convertInput(input, _inout, n);
_impl->process(_inout, _inout, n); _impl->process(_inout, _inout, n);
convertOutputToInt16(_inout, output, n); convertOutput(_inout, output, n);
input += 2 * n; input += 2 * n;
output += 2 * n; output += 2 * n;
@ -2034,11 +2034,11 @@ void AudioReverb::render(const float* input, float* output, int numFrames) {
int n = MIN(numFrames, REVERB_BLOCK); int n = MIN(numFrames, REVERB_BLOCK);
convertInputFromFloat(input, _inout, n); convertInput(input, _inout, n);
_impl->process(_inout, _inout, n); _impl->process(_inout, _inout, n);
convertOutputToFloat(_inout, output, n); convertOutput(_inout, output, n);
input += 2 * n; input += 2 * n;
output += 2 * n; output += 2 * n;

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

@ -73,11 +73,11 @@ private:
float* _inout[2]; float* _inout[2];
void convertInputFromInt16(const int16_t* input, float** outputs, int numFrames); void convertInput(const int16_t* input, float** outputs, int numFrames);
void convertOutputToInt16(float** inputs, int16_t* output, int numFrames); void convertOutput(float** inputs, int16_t* output, int numFrames);
void convertInputFromFloat(const float* input, float** outputs, int numFrames); void convertInput(const float* input, float** outputs, int numFrames);
void convertOutputToFloat(float** inputs, float* output, int numFrames); void convertOutput(float** inputs, float* output, int numFrames);
}; };
#endif // hifi_AudioReverb_h #endif // hifi_AudioReverb_h