Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 04:57:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

ensure that injectors are cleaned up once inactive

Browse source
This commit is contained in:
Stephen Birarda 2016-02-09 14:30:59 -08:00
parent 1773233af4
commit 7b2726f89b
3 changed files with 23 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -155,50 +155,33 @@ int AudioMixerClientData::parseData(ReceivedMessage& message) {
} }
void AudioMixerClientData::checkBuffersBeforeFrameSend() { void AudioMixerClientData::checkBuffersBeforeFrameSend() {
QReadLocker readLocker { &_streamsLock };
auto it = _audioStreams.cbegin();
while (it != _audioStreams.cend()) {
SharedStreamPointer stream = it->second;
if (stream->popFrames(1, true) > 0) {
stream->updateLastPopOutputLoudnessAndTrailingLoudness();
}
++it;
}
}
void AudioMixerClientData::removeDeadInjectedStreams() {
const int INJECTOR_CONSECUTIVE_NOT_MIXED_AFTER_STARTED_THRESHOLD = 100;
// we have this second threshold in case the injected audio is so short that the injected stream
// never even reaches its desired size, which means it will never start.
const int INJECTOR_CONSECUTIVE_NOT_MIXED_THRESHOLD = 1000;
QWriteLocker writeLocker { &_streamsLock }; QWriteLocker writeLocker { &_streamsLock };
qDebug() << _audioStreams.size();
auto it = _audioStreams.begin(); auto it = _audioStreams.begin();
while (it != _audioStreams.end()) { while (it != _audioStreams.end()) {
PositionalAudioStream* audioStream = it->second.get(); SharedStreamPointer stream = it->second;
if (audioStream->getType() == PositionalAudioStream::Injector && audioStream->isStarved()) { static const int INJECTOR_INACTIVITY_USECS = 5 * USECS_PER_SECOND;
InjectedAudioStream* injectedStream = dynamic_cast<InjectedAudioStream*>(audioStream);
int notMixedThreshold = audioStream->hasStarted()
? INJECTOR_CONSECUTIVE_NOT_MIXED_AFTER_STARTED_THRESHOLD
: INJECTOR_CONSECUTIVE_NOT_MIXED_THRESHOLD;
if (injectedStream->getConsecutiveNotMixedCount() >= notMixedThreshold) { // if we don't have new data for an injected stream in the last INJECTOR_INACTIVITY_MSECS then
emit injectorStreamFinished(injectedStream->getStreamIdentifier()); // we remove the injector from our streams
it = _audioStreams.erase(it); if (stream->getType() == PositionalAudioStream::Injector
continue; && stream->usecsSinceLastPacket() > INJECTOR_INACTIVITY_USECS) {
// 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
emit injectorStreamFinished(it->second->getStreamIdentifier());
// erase the stream to drop our ref to the shared pointer and remove it
it = _audioStreams.erase(it);
} else {
if (stream->popFrames(1, true) > 0) {
stream->updateLastPopOutputLoudnessAndTrailingLoudness();
} }
}
++it; ++it;
}
} }
} }

2
assignment-client/src/audio/AudioMixerClientData.h
View file

@ -45,7 +45,7 @@ public:
// removes an AudioHRTF object for a given stream // removes an AudioHRTF object for a given stream
void removeHRTFForStream(const QUuid& nodeID, const QUuid& streamID = QUuid()); void removeHRTFForStream(const QUuid& nodeID, const QUuid& streamID = QUuid());
int parseData(ReceivedMessage& me ssage); int parseData(ReceivedMessage& message);
void checkBuffersBeforeFrameSend(); void checkBuffersBeforeFrameSend();

4
libraries/audio/src/InboundAudioStream.h
View file

@ -116,6 +116,8 @@ public:
bool lastPopSucceeded() const { return _lastPopSucceeded; }; bool lastPopSucceeded() const { return _lastPopSucceeded; };
const AudioRingBuffer::ConstIterator& getLastPopOutput() const { return _lastPopOutput; } const AudioRingBuffer::ConstIterator& getLastPopOutput() const { return _lastPopOutput; }
quint64 usecsSinceLastPacket() { return usecTimestampNow() - _lastPacketReceivedTime; }
void setToStarved(); void setToStarved();
void setSettings(const Settings& settings); void setSettings(const Settings& settings);
@ -171,7 +173,7 @@ public:
float getWetLevel() const { return _wetLevel; } float getWetLevel() const { return _wetLevel; }
void setReverb(float reverbTime, float wetLevel); void setReverb(float reverbTime, float wetLevel);
void clearReverb() { _hasReverb = false; } void clearReverb() { _hasReverb = false; }
public slots: public slots:
/// This function should be called every second for all the stats to function properly. If dynamic jitter buffers /// This function should be called every second for all the stats to function properly. If dynamic jitter buffers
/// is enabled, those stats are used to calculate _desiredJitterBufferFrames. /// is enabled, those stats are used to calculate _desiredJitterBufferFrames.