Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-25 01:03:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2446 from birarda/master

Browse source 
fix a boneheaded mistake in trailing average for AudioRingBuffer loudness
This commit is contained in:
Stephen Birarda 2014-03-21 18:45:42 -07:00
commit 9e39c65d1c
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
assignment-client/src/audio/AudioMixer.cpp
View file

@ -449,7 +449,6 @@ void AudioMixer::run() {
}
}
qDebug() << "There were" << _numClientsMixedInFrame << "clients mixed in the last frame";
_numClientsMixedInFrame = 0;
// push forward the next output pointers for any audio buffers we used

6
libraries/audio/src/AudioRingBuffer.cpp
View file

@ -68,9 +68,9 @@ void AudioRingBuffer::updateAverageLoudnessForBoundarySamples(int numSamples) {
nextLoudness /= MAX_SAMPLE_VALUE;
const int TRAILING_AVERAGE_FRAMES = 100;
const float CURRENT_FRAME_RATIO = 1 / TRAILING_AVERAGE_FRAMES;
const float PREVIOUS_FRAMES_RATIO = 1 - CURRENT_FRAME_RATIO;
const float LOUDNESS_EPSILON = 0.001;
const float CURRENT_FRAME_RATIO = 1.0f / TRAILING_AVERAGE_FRAMES;
const float PREVIOUS_FRAMES_RATIO = 1.0f - CURRENT_FRAME_RATIO;
const float LOUDNESS_EPSILON = 0.01f;
if (nextLoudness >= _averageLoudness) {
_averageLoudness = nextLoudness;