diff --git a/assignment-client/src/audio/AudioMixerClientData.cpp b/assignment-client/src/audio/AudioMixerClientData.cpp index c624c1dc01..ae4a0269cc 100644 --- a/assignment-client/src/audio/AudioMixerClientData.cpp +++ b/assignment-client/src/audio/AudioMixerClientData.cpp @@ -162,14 +162,13 @@ void AudioMixerClientData::pushBuffersAfterFrameSend() { AudioStreamStats AudioMixerClientData::getAudioStreamStatsOfStream(const PositionalAudioRingBuffer* ringBuffer) const { AudioStreamStats streamStats; - const SequenceNumberStats* streamSequenceNumberStats; streamStats._streamType = ringBuffer->getType(); if (streamStats._streamType == PositionalAudioRingBuffer::Injector) { streamStats._streamIdentifier = ((InjectedAudioRingBuffer*)ringBuffer)->getStreamIdentifier(); - streamSequenceNumberStats = &_incomingInjectedAudioSequenceNumberStatsMap[streamStats._streamIdentifier]; + streamStats._packetStreamStats = _incomingInjectedAudioSequenceNumberStatsMap[streamStats._streamIdentifier].getStats(); } else { - streamSequenceNumberStats = &_incomingAvatarAudioSequenceNumberStats; + streamStats._packetStreamStats = _incomingAvatarAudioSequenceNumberStats.getStats(); } const MovingMinMaxAvg& timeGapStats = ringBuffer->getInterframeTimeGapStatsForStatsPacket(); @@ -187,14 +186,6 @@ AudioStreamStats AudioMixerClientData::getAudioStreamStatsOfStream(const Positio streamStats._ringBufferConsecutiveNotMixedCount = ringBuffer->getConsecutiveNotMixedCount(); streamStats._ringBufferOverflowCount = ringBuffer->getOverflowCount(); streamStats._ringBufferSilentFramesDropped = ringBuffer->getSilentFramesDropped(); - - streamStats._packetStreamStats._numReceived = streamSequenceNumberStats->getNumReceived(); - streamStats._packetStreamStats._numUnreasonable = streamSequenceNumberStats->getNumUnreasonable(); - streamStats._packetStreamStats._numEarly = streamSequenceNumberStats->getNumEarly(); - streamStats._packetStreamStats._numLate = streamSequenceNumberStats->getNumLate(); - streamStats._packetStreamStats._numLost = streamSequenceNumberStats->getNumLost(); - streamStats._packetStreamStats._numRecovered = streamSequenceNumberStats->getNumRecovered(); - streamStats._packetStreamStats._numDuplicate = streamSequenceNumberStats->getNumDuplicate(); return streamStats; } diff --git a/libraries/shared/src/MovingMinMaxAvg.h b/libraries/shared/src/MovingMinMaxAvg.h index 79f4b0e3cb..7c645dbd93 100644 --- a/libraries/shared/src/MovingMinMaxAvg.h +++ b/libraries/shared/src/MovingMinMaxAvg.h @@ -12,6 +12,8 @@ #ifndef hifi_MovingMinMaxAvg_h #define hifi_MovingMinMaxAvg_h +#include + #include "RingBufferHistory.h" template