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

Merge pull request #7076 from birarda/integrate-new-hrtf

Browse source 
use injector not mixed count for inactivity
This commit is contained in:
Andrew Meadows 2016-02-12 15:14:53 -08:00
commit 2f2d1b5d22
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -157,12 +157,16 @@ void AudioMixerClientData::checkBuffersBeforeFrameSend() {
while (it != _audioStreams.end()) { while (it != _audioStreams.end()) {
SharedStreamPointer stream = it->second; SharedStreamPointer stream = it->second;
static const int INJECTOR_INACTIVITY_USECS = 5 * USECS_PER_SECOND; if (stream->popFrames(1, true) > 0) {
stream->updateLastPopOutputLoudnessAndTrailingLoudness();
}
// if we don't have new data for an injected stream in the last INJECTOR_INACTIVITY_MSECS then static const int INJECTOR_MAX_INACTIVE_BLOCKS = 500;
// if we don't have new data for an injected stream in the last INJECTOR_MAX_INACTIVE_BLOCKS then
// we remove the injector from our streams // we remove the injector from our streams
if (stream->getType() == PositionalAudioStream::Injector if (stream->getType() == PositionalAudioStream::Injector
&& stream->usecsSinceLastPacket() > INJECTOR_INACTIVITY_USECS) { && stream->getConsecutiveNotMixedCount() > INJECTOR_MAX_INACTIVE_BLOCKS) {
// this is an inactive injector, pull it from our streams // this is an inactive injector, pull it from our streams
// first emit that it is finished so that the HRTF objects for this source can be cleaned up // first emit that it is finished so that the HRTF objects for this source can be cleaned up
@ -170,12 +174,7 @@ void AudioMixerClientData::checkBuffersBeforeFrameSend() {
// erase the stream to drop our ref to the shared pointer and remove it // erase the stream to drop our ref to the shared pointer and remove it
it = _audioStreams.erase(it); it = _audioStreams.erase(it);
} else { } else {
if (stream->popFrames(1, true) > 0) {
stream->updateLastPopOutputLoudnessAndTrailingLoudness();
}
++it; ++it;
} }
} }