From 1d256be7ee5e04825d24f6a80bbb5bbd8cedf8af Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Mon, 18 Apr 2016 16:04:20 -0700 Subject: [PATCH] fix random stats sending for AudioMixer clients --- assignment-client/src/audio/AudioMixerClientData.cpp | 4 ++++ assignment-client/src/audio/AudioMixerClientData.h | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/assignment-client/src/audio/AudioMixerClientData.cpp b/assignment-client/src/audio/AudioMixerClientData.cpp index c0311f7cc4..537ef793e1 100644 --- a/assignment-client/src/audio/AudioMixerClientData.cpp +++ b/assignment-client/src/audio/AudioMixerClientData.cpp @@ -189,6 +189,10 @@ void AudioMixerClientData::checkBuffersBeforeFrameSend() { } } +bool AudioMixerClientData::shouldSendStats(int frameNumber) { + return (frameNumber % (int) ceil(1.0f / AudioConstants::NETWORK_FRAME_SECS)) == _frameToSendStats; +} + void AudioMixerClientData::sendAudioStreamStatsPackets(const SharedNodePointer& destinationNode) { auto nodeList = DependencyManager::get(); diff --git a/assignment-client/src/audio/AudioMixerClientData.h b/assignment-client/src/audio/AudioMixerClientData.h index b95023674b..ff4143cf08 100644 --- a/assignment-client/src/audio/AudioMixerClientData.h +++ b/assignment-client/src/audio/AudioMixerClientData.h @@ -59,7 +59,7 @@ public: quint16 getOutgoingSequenceNumber() const { return _outgoingMixedAudioSequenceNumber; } // uses randomization to have the AudioMixer send a stats packet to this node around every second - bool shouldSendStats(int frameNumber) { return frameNumber % _frameToSendStats == 0; } + bool shouldSendStats(int frameNumber); signals: void injectorStreamFinished(const QUuid& streamIdentifier);