Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-05 05:34:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

loop and variable name cleanup

Browse source
This commit is contained in:
ZappoMan 2014-04-15 15:16:55 -07:00
parent e514c95642
commit 5bc8c83706
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
interface/src/Audio.cpp
View file

@ -708,13 +708,12 @@ void Audio::addSpatialAudioToBuffer(unsigned int sampleTime, const QByteArray& s
mixedSamplesCount = (mixedSamplesCount < numSamples) ? mixedSamplesCount : numSamples;
const int16_t* spatial = reinterpret_cast<const int16_t*>(spatialAudio.data());
int j = 0;
for (int i = mixedSamplesCount; --i >= 0; j++) {
int t1 = _spatialAudioRingBuffer[j + offset];
int t2 = spatial[j];
int tmp = t1 + t2;
_spatialAudioRingBuffer[j + offset] =
static_cast<int16_t>(glm::clamp<int>(tmp, std::numeric_limits<short>::min(), std::numeric_limits<short>::max()));
for (int i = 0; i < mixedSamplesCount; i++) {
int existingSample = _spatialAudioRingBuffer[i + offset];
int newSample = spatial[i];
int sumOfSamples = existingSample + newSample;
_spatialAudioRingBuffer[i + offset] = static_cast<int16_t>(glm::clamp<int>(sumOfSamples,
std::numeric_limits<short>::min(), std::numeric_limits<short>::max()));
}
// Copy the remaining unoverlapped spatial audio to the spatial audio buffer, if any