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

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

Browse source
This commit is contained in:
Ken Cooke 2016-07-03 11:33:05 -07:00
parent 941067b9d0
commit f7c9957bb1
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/AudioSRC.cpp
View file

@ -389,7 +389,7 @@ int AudioSRC::multirateFilter2(const float* input0, const float* input1, float*
} }
// convert int16_t to float, deinterleave stereo // convert int16_t to float, deinterleave stereo
void AudioSRC::convertInputFromInt16(const int16_t* input, float** outputs, int numFrames) { void AudioSRC::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);
if (_numChannels == 1) { if (_numChannels == 1) {
@ -467,8 +467,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 AudioSRC::convertOutputToInt16(float** inputs, int16_t* output, int numFrames) { void AudioSRC::convertOutput(float** inputs, int16_t* output, int numFrames) {
__m128 scale = _mm_set1_ps(32768.0f); __m128 scale = _mm_set1_ps(32768.0f);
if (_numChannels == 1) { if (_numChannels == 1) {
@ -540,7 +540,7 @@ void AudioSRC::convertOutputToInt16(float** inputs, int16_t* output, int numFram
} }
// deinterleave stereo // deinterleave stereo
void AudioSRC::convertInputFromFloat(const float* input, float** outputs, int numFrames) { void AudioSRC::convertInput(const float* input, float** outputs, int numFrames) {
if (_numChannels == 1) { if (_numChannels == 1) {
@ -566,7 +566,7 @@ void AudioSRC::convertInputFromFloat(const float* input, float** outputs, int nu
} }
// interleave stereo // interleave stereo
void AudioSRC::convertOutputToFloat(float** inputs, float* output, int numFrames) { void AudioSRC::convertOutput(float** inputs, float* output, int numFrames) {
if (_numChannels == 1) { if (_numChannels == 1) {
@ -726,7 +726,7 @@ int AudioSRC::multirateFilter2(const float* input0, const float* input1, float*
} }
// convert int16_t to float, deinterleave stereo // convert int16_t to float, deinterleave stereo
void AudioSRC::convertInputFromInt16(const int16_t* input, float** outputs, int numFrames) { void AudioSRC::convertInput(const int16_t* input, float** outputs, int numFrames) {
const float scale = 1/32768.0f; const float scale = 1/32768.0f;
if (_numChannels == 1) { if (_numChannels == 1) {
@ -750,8 +750,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 AudioSRC::convertOutputToInt16(float** inputs, int16_t* output, int numFrames) { void AudioSRC::convertOutput(float** inputs, int16_t* output, int numFrames) {
const float scale = 32768.0f; const float scale = 32768.0f;
if (_numChannels == 1) { if (_numChannels == 1) {
@ -791,7 +791,7 @@ void AudioSRC::convertOutputToInt16(float** inputs, int16_t* output, int numFram
} }
// deinterleave stereo // deinterleave stereo
void AudioSRC::convertInputFromFloat(const float* input, float** outputs, int numFrames) { void AudioSRC::convertInput(const float* input, float** outputs, int numFrames) {
if (_numChannels == 1) { if (_numChannels == 1) {
@ -807,7 +807,7 @@ void AudioSRC::convertInputFromFloat(const float* input, float** outputs, int nu
} }
// interleave stereo // interleave stereo
void AudioSRC::convertOutputToFloat(float** inputs, float* output, int numFrames) { void AudioSRC::convertOutput(float** inputs, float* output, int numFrames) {
if (_numChannels == 1) { if (_numChannels == 1) {
@ -953,12 +953,12 @@ int AudioSRC::render(const int16_t* input, int16_t* output, int inputFrames) {
int ni = std::min(inputFrames, _inputBlock); int ni = std::min(inputFrames, _inputBlock);
convertInputFromInt16(input, _inputs, ni); convertInput(input, _inputs, ni);
int no = render(_inputs, _outputs, ni); int no = render(_inputs, _outputs, ni);
assert(no <= SRC_BLOCK); assert(no <= SRC_BLOCK);
convertOutputToInt16(_outputs, output, no); convertOutput(_outputs, output, no);
input += _numChannels * ni; input += _numChannels * ni;
output += _numChannels * no; output += _numChannels * no;
@ -979,12 +979,12 @@ int AudioSRC::render(const float* input, float* output, int inputFrames) {
int ni = std::min(inputFrames, _inputBlock); int ni = std::min(inputFrames, _inputBlock);
convertInputFromFloat(input, _inputs, ni); convertInput(input, _inputs, ni);
int no = render(_inputs, _outputs, ni); int no = render(_inputs, _outputs, ni);
assert(no <= SRC_BLOCK); assert(no <= SRC_BLOCK);
convertOutputToFloat(_outputs, output, no); convertOutput(_outputs, output, no);
input += _numChannels * ni; input += _numChannels * ni;
output += _numChannels * no; output += _numChannels * no;

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

@ -82,11 +82,11 @@ private:
int multirateFilter1_AVX2(const float* input0, float* output0, int inputFrames); int multirateFilter1_AVX2(const float* input0, float* output0, int inputFrames);
int multirateFilter2_AVX2(const float* input0, const float* input1, float* output0, float* output1, int inputFrames); int multirateFilter2_AVX2(const float* input0, const float* input1, float* output0, float* output1, int inputFrames);
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 // AudioSRC_h #endif // AudioSRC_h