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

streamlined AudioStreamStats packing; added #include <limits>

Browse source
This commit is contained in:
wangyix 2014-07-10 10:44:33 -07:00
parent 35e4b253c2
commit 0b213f9616
2 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -162,14 +162,13 @@ void AudioMixerClientData::pushBuffersAfterFrameSend() {
AudioStreamStats AudioMixerClientData::getAudioStreamStatsOfStream(const PositionalAudioRingBuffer* ringBuffer) const { AudioStreamStats AudioMixerClientData::getAudioStreamStatsOfStream(const PositionalAudioRingBuffer* ringBuffer) const {
AudioStreamStats streamStats; AudioStreamStats streamStats;
const SequenceNumberStats* streamSequenceNumberStats;
streamStats._streamType = ringBuffer->getType(); streamStats._streamType = ringBuffer->getType();
if (streamStats._streamType == PositionalAudioRingBuffer::Injector) { if (streamStats._streamType == PositionalAudioRingBuffer::Injector) {
streamStats._streamIdentifier = ((InjectedAudioRingBuffer*)ringBuffer)->getStreamIdentifier(); streamStats._streamIdentifier = ((InjectedAudioRingBuffer*)ringBuffer)->getStreamIdentifier();
streamSequenceNumberStats = &_incomingInjectedAudioSequenceNumberStatsMap[streamStats._streamIdentifier]; streamStats._packetStreamStats = _incomingInjectedAudioSequenceNumberStatsMap[streamStats._streamIdentifier].getStats();
} else { } else {
streamSequenceNumberStats = &_incomingAvatarAudioSequenceNumberStats; streamStats._packetStreamStats = _incomingAvatarAudioSequenceNumberStats.getStats();
} }
const MovingMinMaxAvg<quint64>& timeGapStats = ringBuffer->getInterframeTimeGapStatsForStatsPacket(); const MovingMinMaxAvg<quint64>& timeGapStats = ringBuffer->getInterframeTimeGapStatsForStatsPacket();
@ -187,14 +186,6 @@ AudioStreamStats AudioMixerClientData::getAudioStreamStatsOfStream(const Positio
streamStats._ringBufferConsecutiveNotMixedCount = ringBuffer->getConsecutiveNotMixedCount(); streamStats._ringBufferConsecutiveNotMixedCount = ringBuffer->getConsecutiveNotMixedCount();
streamStats._ringBufferOverflowCount = ringBuffer->getOverflowCount(); streamStats._ringBufferOverflowCount = ringBuffer->getOverflowCount();
streamStats._ringBufferSilentFramesDropped = ringBuffer->getSilentFramesDropped(); 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; return streamStats;
} }

2
libraries/shared/src/MovingMinMaxAvg.h
View file

@ -12,6 +12,8 @@
#ifndef hifi_MovingMinMaxAvg_h #ifndef hifi_MovingMinMaxAvg_h
#define hifi_MovingMinMaxAvg_h #define hifi_MovingMinMaxAvg_h
#include <limits>
#include "RingBufferHistory.h" #include "RingBufferHistory.h"
template <typename T> template <typename T>