Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-20 04:44:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

simplify resampling

Browse source
This commit is contained in:
Zach Pomerantz 2017-01-11 12:29:04 -05:00
parent 42f5af7c39
commit 61f7f72c5e
1 changed files with 22 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
libraries/audio-client/src/AudioClient.cpp
View file

@ -1108,18 +1108,23 @@ void AudioClient::prepareLocalAudioInjectors() {
_localScratchBuffer[i] = (int16_t)(_localMixBuffer[i] * 32768.0f);
}
// resample to output sample rate
int samples = AudioConstants::NETWORK_FRAME_SAMPLES_STEREO;
int16_t* scratchBuffer = _localScratchBuffer;
int samples;
if (_networkToOutputResampler) {
// resample to output sample rate
int frames = _networkToOutputResampler->render(_localScratchBuffer, _outputScratchBuffer,
AudioConstants::NETWORK_FRAME_SAMPLES_PER_CHANNEL);
// write to local injectors' ring buffer
samples = frames * AudioConstants::STEREO;
scratchBuffer = _outputScratchBuffer;
_localInjectorsBuffer.writeSamples(_outputScratchBuffer, samples);
} else {
// write to local injectors' ring buffer
samples = AudioConstants::NETWORK_FRAME_SAMPLES_STEREO;
_localInjectorsBuffer.writeSamples(_localScratchBuffer,
AudioConstants::NETWORK_FRAME_SAMPLES_STEREO);
}
// write to local injectors' ring buffer
_localInjectorsBuffer.writeSamples(scratchBuffer, samples);
samplesNeeded -= samples;
}
}
@ -1235,16 +1240,20 @@ void AudioClient::processReceivedSamples(const QByteArray& decodedBuffer, QByteA
_listenerReverb.render(_networkMixBuffer, _networkMixBuffer, AudioConstants::NETWORK_FRAME_SAMPLES_PER_CHANNEL);
}
// convert mix audio (float) to network audio (int16_t)
for (int i = 0; i < AudioConstants::NETWORK_FRAME_SAMPLES_STEREO; i++) {
_networkScratchBuffer[i] = (int16_t)(_networkMixBuffer[i] * 32768.0f);
}
// resample to output sample rate
if (_networkToOutputResampler) {
// convert mix audio (float) to network audio (int16_t)
for (int i = 0; i < AudioConstants::NETWORK_FRAME_SAMPLES_STEREO; i++) {
_networkScratchBuffer[i] = (int16_t)(_networkMixBuffer[i] * 32768.0f);
}
// resample to output sample rate
_networkToOutputResampler->render(_networkScratchBuffer, outputSamples, AudioConstants::NETWORK_FRAME_SAMPLES_PER_CHANNEL);
} else {
memcpy(outputBuffer.data(), _networkScratchBuffer, AudioConstants::NETWORK_FRAME_BYTES_STEREO);
// convert mix audio (float) to network audio (int16_t)
for (int i = 0; i < AudioConstants::NETWORK_FRAME_SAMPLES_STEREO; i++) {
outputSamples[i] = (int16_t)(_networkMixBuffer[i] * 32768.0f);
}
}
}