From edfb65acf615895dfc2d826c3af8715f7167a0e3 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 10 Feb 2016 17:38:56 -0800 Subject: [PATCH] more stats printing removal from audio-mixer --- .../src/audio/AudioMixerClientData.cpp | 45 ------------------- .../src/audio/AudioMixerClientData.h | 5 --- 2 files changed, 50 deletions(-) diff --git a/assignment-client/src/audio/AudioMixerClientData.cpp b/assignment-client/src/audio/AudioMixerClientData.cpp index 9a77be9285..fa706eb0f6 100644 --- a/assignment-client/src/audio/AudioMixerClientData.cpp +++ b/assignment-client/src/audio/AudioMixerClientData.cpp @@ -311,48 +311,3 @@ QJsonObject AudioMixerClientData::getAudioStreamStats() { return result; } - -void AudioMixerClientData::printUpstreamDownstreamStats() { - auto streamsCopy = getAudioStreams(); - - // print the upstream (mic stream) stats if the mic stream exists - auto it = streamsCopy.find(QUuid()); - if (it != streamsCopy.end()) { - printf("Upstream:\n"); - printAudioStreamStats(it->second->getAudioStreamStats()); - } - // print the downstream stats if they contain valid info - if (_downstreamAudioStreamStats._packetStreamStats._received > 0) { - printf("Downstream:\n"); - printAudioStreamStats(_downstreamAudioStreamStats); - } -} - -void AudioMixerClientData::printAudioStreamStats(const AudioStreamStats& streamStats) const { - printf(" Packet loss | overall: %5.2f%% (%d lost), last_30s: %5.2f%% (%d lost)\n", - (double)(streamStats._packetStreamStats.getLostRate() * 100.0f), - streamStats._packetStreamStats._lost, - (double)(streamStats._packetStreamWindowStats.getLostRate() * 100.0f), - streamStats._packetStreamWindowStats._lost); - - printf(" Ringbuffer frames | desired: %u, avg_available(10s): %u, available: %u\n", - streamStats._desiredJitterBufferFrames, - streamStats._framesAvailableAverage, - streamStats._framesAvailable); - - printf(" Ringbuffer stats | starves: %u, prev_starve_lasted: %u, frames_dropped: %u, overflows: %u\n", - streamStats._starveCount, - streamStats._consecutiveNotMixedCount, - streamStats._framesDropped, - streamStats._overflowCount); - - printf(" Inter-packet timegaps (overall) | min: %9s, max: %9s, avg: %9s\n", - formatUsecTime(streamStats._timeGapMin).toLatin1().data(), - formatUsecTime(streamStats._timeGapMax).toLatin1().data(), - formatUsecTime(streamStats._timeGapAverage).toLatin1().data()); - - printf(" Inter-packet timegaps (last 30s) | min: %9s, max: %9s, avg: %9s\n", - formatUsecTime(streamStats._timeGapWindowMin).toLatin1().data(), - formatUsecTime(streamStats._timeGapWindowMax).toLatin1().data(), - formatUsecTime(streamStats._timeGapWindowAverage).toLatin1().data()); -} diff --git a/assignment-client/src/audio/AudioMixerClientData.h b/assignment-client/src/audio/AudioMixerClientData.h index 7e21a37a37..3627a247c0 100644 --- a/assignment-client/src/audio/AudioMixerClientData.h +++ b/assignment-client/src/audio/AudioMixerClientData.h @@ -58,14 +58,9 @@ public: void incrementOutgoingMixedAudioSequenceNumber() { _outgoingMixedAudioSequenceNumber++; } quint16 getOutgoingSequenceNumber() const { return _outgoingMixedAudioSequenceNumber; } - void printUpstreamDownstreamStats(); - signals: void injectorStreamFinished(const QUuid& streamIdentifier); -private: - void printAudioStreamStats(const AudioStreamStats& streamStats) const; - private: QReadWriteLock _streamsLock; AudioStreamMap _audioStreams; // microphone stream from avatar is stored under key of null UUID