Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-07 18:21:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

use a trailing average for _nextOutputLoudness

Browse source
This commit is contained in:
Stephen Birarda 2014-03-20 16:50:20 -07:00
parent 7f96c71793
commit 5515141792
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
assignment-client/src/audio/AudioMixerClientData.cpp
View file

@ -93,9 +93,13 @@ void AudioMixerClientData::checkBuffersBeforeFrameSend(int jitterBufferLengthSam
// set its flag so we know to push its buffer when all is said and done // set its flag so we know to push its buffer when all is said and done
_ringBuffers[i]->setWillBeAddedToMix(true); _ringBuffers[i]->setWillBeAddedToMix(true);
const int TRAILING_AVERAGE_FRAMES = 100;
const float CURRENT_FRAME_RATIO = 1 / TRAILING_AVERAGE_FRAMES;
const float PREVIOUS_FRAMES_RATIO = 1 - CURRENT_FRAME_RATIO;
// calculate the average loudness for the next NETWORK_BUFFER_LENGTH_SAMPLES_PER_CHANNEL // calculate the average loudness for the next NETWORK_BUFFER_LENGTH_SAMPLES_PER_CHANNEL
// that would be mixed in // that would be mixed in
_nextOutputLoudness = _ringBuffers[i]->averageLoudnessForBoundarySamples(NETWORK_BUFFER_LENGTH_SAMPLES_PER_CHANNEL); _nextOutputLoudness = (_nextOutputLoudness * PREVIOUS_FRAMES_RATIO) + (CURRENT_FRAME_RATIO * _ringBuffers[i]->averageLoudnessForBoundarySamples(NETWORK_BUFFER_LENGTH_SAMPLES_PER_CHANNEL));
if (_nextOutputLoudness != 0 && _nextOutputLoudness < currentMinLoudness) { if (_nextOutputLoudness != 0 && _nextOutputLoudness < currentMinLoudness) {
currentMinLoudness = _nextOutputLoudness; currentMinLoudness = _nextOutputLoudness;