Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 13:51:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

dead injected streams are now periodically removed in AudioMixer

Browse source
This commit is contained in:
wangyix 2014-07-25 16:32:08 -07:00
parent 78031622db
commit e6f913edb1
3 changed files with 31 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -553,7 +553,7 @@ void AudioMixer::run() {
// in InboundAudioStream. That's how the popped audio data will be read for mixing
nodeData->audioStreamsPopFrameForMixing();
if (node->getType() == NodeType::Agent //&& node->getActiveSocket() && node->getLinkedData()
if (node->getType() == NodeType::Agent
&& ((AudioMixerClientData*)node->getLinkedData())->getAvatarAudioRingBuffer()) {
prepareMixForListeningNode(node.data());

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

@ -105,7 +105,35 @@ void AudioMixerClientData::audioStreamsPopFrameForMixing() {
}
}
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 ringbuffer
// never even reaches its desired size, which means it will never start.
const int INJECTOR_CONSECUTIVE_NOT_MIXED_THRESHOLD = 1000;
QHash<QUuid, PositionalAudioRingBuffer*>::Iterator i = _ringBuffers.begin(), end = _ringBuffers.end();
while (i != end) {
PositionalAudioRingBuffer* audioStream = i.value();
if (audioStream->getType() == PositionalAudioRingBuffer::Injector && audioStream->isStarved()) {
int notMixedThreshold = audioStream->hasStarted() ? INJECTOR_CONSECUTIVE_NOT_MIXED_AFTER_STARTED_THRESHOLD
: INJECTOR_CONSECUTIVE_NOT_MIXED_THRESHOLD;
if (audioStream->getConsecutiveNotMixedCount() >= notMixedThreshold) {
delete audioStream;
i = _ringBuffers.erase(i);
continue;
}
}
++i;
}
}
void AudioMixerClientData::sendAudioStreamStatsPackets(const SharedNodePointer& destinationNode) {
// since audio stream stats packets are sent periodically, this is a good place to remove our dead injected streams.
removeDeadInjectedStreams();
char packet[MAX_PACKET_SIZE];
NodeList* nodeList = NodeList::getInstance();

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

@ -29,6 +29,8 @@ public:
void audioStreamsPopFrameForMixing();
void removeDeadInjectedStreams();
QString getAudioStreamStatsString() const;
void sendAudioStreamStatsPackets(const SharedNodePointer& destinationNode);