From e39ea72daf96604ff215547d5818f1f16e2cd3cc Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Tue, 14 Jul 2015 21:25:49 -0700 Subject: [PATCH] removed dead code --- interface/src/Application.cpp | 2 - interface/src/Menu.cpp | 10 +- interface/src/Util.cpp | 17 -- interface/src/Util.h | 3 - interface/src/audio/AudioIOStatsRenderer.cpp | 242 ------------------- interface/src/audio/AudioIOStatsRenderer.h | 45 ---- interface/src/ui/ApplicationOverlay.cpp | 1 - 7 files changed, 2 insertions(+), 318 deletions(-) delete mode 100644 interface/src/audio/AudioIOStatsRenderer.cpp delete mode 100644 interface/src/audio/AudioIOStatsRenderer.h diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 65615a65b0..dec179d479 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -112,7 +112,6 @@ #include "avatar/AvatarManager.h" -#include "audio/AudioIOStatsRenderer.h" #include "audio/AudioScope.h" #include "devices/DdeFaceTracker.h" @@ -274,7 +273,6 @@ bool setupEssentials(int& argc, char** argv) { auto faceshift = DependencyManager::set(); auto audio = DependencyManager::set(); auto audioScope = DependencyManager::set(); - auto audioIOStatsRenderer = DependencyManager::set(); auto deferredLightingEffect = DependencyManager::set(); auto ambientOcclusionEffect = DependencyManager::set(); auto textureCache = DependencyManager::set(); diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp index 60311904de..f292ff2d2a 100644 --- a/interface/src/Menu.cpp +++ b/interface/src/Menu.cpp @@ -24,7 +24,6 @@ #include "Application.h" #include "AccountManager.h" -#include "audio/AudioIOStatsRenderer.h" #include "audio/AudioScope.h" #include "avatar/AvatarManager.h" #include "devices/DdeFaceTracker.h" @@ -588,18 +587,13 @@ Menu::Menu() { audioScopeFramesGroup->addAction(fiftyFrames); } - auto statsRenderer = DependencyManager::get(); addCheckableActionToQMenuAndActionHash(audioDebugMenu, MenuOption::AudioStats, Qt::CTRL | Qt::SHIFT | Qt::Key_A, - false, - statsRenderer.data(), - SLOT(toggle())); + false); //, statsRenderer.data(), SLOT(toggle())); // TODO: convert to dialogbox addCheckableActionToQMenuAndActionHash(audioDebugMenu, MenuOption::AudioStatsShowInjectedStreams, 0, - false, - statsRenderer.data(), - SLOT(toggleShowInjectedStreams())); + false); //, statsRenderer.data(), SLOT(toggleShowInjectedStreams)); // TODO: convert to dialogbox MenuWrapper* physicsOptionsMenu = developerMenu->addMenu("Physics"); diff --git a/interface/src/Util.cpp b/interface/src/Util.cpp index 82f7d55b5d..9a013c8f6f 100644 --- a/interface/src/Util.cpp +++ b/interface/src/Util.cpp @@ -100,23 +100,6 @@ int widthText(float scale, int mono, char const* string) { return textRenderer(mono)->computeExtent(string).x; // computeWidth(string) * (scale / 0.10); } -void drawText(int x, int y, float scale, float radians, int mono, - char const* string, const float* color) { - // - // Draws text on screen as stroked so it can be resized - // - glPushMatrix(); - glTranslatef(static_cast(x), static_cast(y), 0.0f); - - - glRotated(double(radians * DEGREES_PER_RADIAN), 0.0, 0.0, 1.0); - glScalef(scale / 0.1f, scale / 0.1f, 1.0f); - - glm::vec4 colorV4 = {color[0], color[1], color[2], 1.0f }; - textRenderer(mono)->draw(0, 0, string, colorV4); - glPopMatrix(); -} - void renderCollisionOverlay(int width, int height, float magnitude, float red, float blue, float green) { const float MIN_VISIBLE_COLLISION = 0.01f; if (magnitude > MIN_VISIBLE_COLLISION) { diff --git a/interface/src/Util.h b/interface/src/Util.h index d252c26bef..a422918d9a 100644 --- a/interface/src/Util.h +++ b/interface/src/Util.h @@ -24,9 +24,6 @@ const glm::vec3 randVector(); void renderWorldBox(gpu::Batch& batch); int widthText(float scale, int mono, char const* string); -void drawText(int x, int y, float scale, float radians, int mono, - char const* string, const float* color); - void renderCollisionOverlay(int width, int height, float magnitude, float red = 0, float blue = 0, float green = 0); void runTimingTests(); diff --git a/interface/src/audio/AudioIOStatsRenderer.cpp b/interface/src/audio/AudioIOStatsRenderer.cpp deleted file mode 100644 index 35b716c611..0000000000 --- a/interface/src/audio/AudioIOStatsRenderer.cpp +++ /dev/null @@ -1,242 +0,0 @@ -// -// AudioIOStatsRenderer.cpp -// interface/src/audio -// -// Created by Stephen Birarda on 2014-12-16. -// Copyright 2014 High Fidelity, Inc. -// -// Distributed under the Apache License, Version 2.0. -// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html -// - -#include "InterfaceConfig.h" - -#include -#include -#include -#include -#include -#include -#include - -#include "AudioIOStatsRenderer.h" - -AudioIOStatsRenderer::AudioIOStatsRenderer() : - _stats(NULL), - _isEnabled(false), - _shouldShowInjectedStreams(false) -{ - // grab the stats object from the audio I/O singleton - _stats = &DependencyManager::get()->getStats(); -} - -#ifdef _WIN32 -const unsigned int STATS_WIDTH = 1500; -#else -const unsigned int STATS_WIDTH = 650; -#endif -const unsigned int STATS_HEIGHT_PER_LINE = 20; - -void AudioIOStatsRenderer::render(const float* color, int width, int height) { - if (!_isEnabled) { - return; - } - - const int linesWhenCentered = _shouldShowInjectedStreams ? 34 : 27; - const int CENTERED_BACKGROUND_HEIGHT = STATS_HEIGHT_PER_LINE * linesWhenCentered; - - int lines = _shouldShowInjectedStreams ? _stats->getMixerInjectedStreamStatsMap().size() * 7 + 27 : 27; - int statsHeight = STATS_HEIGHT_PER_LINE * lines; - - - static const glm::vec4 backgroundColor = { 0.2f, 0.2f, 0.2f, 0.6f }; - int x = std::max((width - (int)STATS_WIDTH) / 2, 0); - int y = std::max((height - CENTERED_BACKGROUND_HEIGHT) / 2, 0); - int w = STATS_WIDTH; - int h = statsHeight; - DependencyManager::get()->renderQuad(x, y, w, h, backgroundColor); - - int horizontalOffset = x + 5; - int verticalOffset = y; - - float scale = 0.10f; - float rotation = 0.0f; - int font = 2; - - char latencyStatString[512]; - - float audioInputBufferLatency = 0.0f, inputRingBufferLatency = 0.0f, networkRoundtripLatency = 0.0f, mixerRingBufferLatency = 0.0f, outputRingBufferLatency = 0.0f, audioOutputBufferLatency = 0.0f; - - AudioStreamStats downstreamAudioStreamStats = _stats->getMixerDownstreamStats(); - SharedNodePointer audioMixerNodePointer = DependencyManager::get()->soloNodeOfType(NodeType::AudioMixer); - if (!audioMixerNodePointer.isNull()) { - audioInputBufferLatency = _stats->getAudioInputMsecsReadStats().getWindowAverage(); - inputRingBufferLatency = (float) _stats->getInputRungBufferMsecsAvailableStats().getWindowAverage(); - networkRoundtripLatency = audioMixerNodePointer->getPingMs(); - mixerRingBufferLatency = _stats->getMixerAvatarStreamStats()._framesAvailableAverage * AudioConstants::NETWORK_FRAME_MSECS; - outputRingBufferLatency = downstreamAudioStreamStats._framesAvailableAverage * AudioConstants::NETWORK_FRAME_MSECS; - audioOutputBufferLatency = _stats->getAudioOutputMsecsUnplayedStats().getWindowAverage(); - } - float totalLatency = audioInputBufferLatency + inputRingBufferLatency + networkRoundtripLatency + mixerRingBufferLatency + outputRingBufferLatency + audioOutputBufferLatency; - - sprintf(latencyStatString, - " Audio input buffer: %7.2fms - avg msecs of samples read to the input ring buffer in last 10s", - (double)audioInputBufferLatency); - verticalOffset += STATS_HEIGHT_PER_LINE; - drawText(horizontalOffset, verticalOffset, scale, rotation, font, latencyStatString, color); - - sprintf(latencyStatString, - " Input ring buffer: %7.2fms - avg msecs of samples in input ring buffer in last 10s", - (double)inputRingBufferLatency); - verticalOffset += STATS_HEIGHT_PER_LINE; - drawText(horizontalOffset, verticalOffset, scale, rotation, font, latencyStatString, color); - - sprintf(latencyStatString, - " Network to mixer: %7.2fms - half of last ping value calculated by the node list", - (double)(networkRoundtripLatency / 2.0f)); - verticalOffset += STATS_HEIGHT_PER_LINE; - drawText(horizontalOffset, verticalOffset, scale, rotation, font, latencyStatString, color); - - sprintf(latencyStatString, - " AudioMixer ring buffer: %7.2fms - avg msecs of samples in audio mixer's ring buffer in last 10s", - (double)mixerRingBufferLatency); - verticalOffset += STATS_HEIGHT_PER_LINE; - drawText(horizontalOffset, verticalOffset, scale, rotation, font, latencyStatString, color); - - sprintf(latencyStatString, - " Network to client: %7.2fms - half of last ping value calculated by the node list", - (double)(networkRoundtripLatency / 2.0f)); - verticalOffset += STATS_HEIGHT_PER_LINE; - drawText(horizontalOffset, verticalOffset, scale, rotation, font, latencyStatString, color); - - sprintf(latencyStatString, - " Output ring buffer: %7.2fms - avg msecs of samples in output ring buffer in last 10s", - (double)outputRingBufferLatency); - verticalOffset += STATS_HEIGHT_PER_LINE; - drawText(horizontalOffset, verticalOffset, scale, rotation, font, latencyStatString, color); - - sprintf(latencyStatString, - " Audio output buffer: %7.2fms - avg msecs of samples in audio output buffer in last 10s", - (double)audioOutputBufferLatency); - verticalOffset += STATS_HEIGHT_PER_LINE; - drawText(horizontalOffset, verticalOffset, scale, rotation, font, latencyStatString, color); - - sprintf(latencyStatString, " TOTAL: %7.2fms\n", (double)totalLatency); - verticalOffset += STATS_HEIGHT_PER_LINE; - drawText(horizontalOffset, verticalOffset, scale, rotation, font, latencyStatString, color); - - - verticalOffset += STATS_HEIGHT_PER_LINE; // blank line - - char clientUpstreamMicLabelString[] = "Upstream Mic Audio Packets Sent Gaps (by client):"; - verticalOffset += STATS_HEIGHT_PER_LINE; - drawText(horizontalOffset, verticalOffset, scale, rotation, font, clientUpstreamMicLabelString, color); - - const MovingMinMaxAvg& packetSentTimeGaps = _stats->getPacketSentTimeGaps(); - - char stringBuffer[512]; - sprintf(stringBuffer, " Inter-packet timegaps (overall) | min: %9s, max: %9s, avg: %9s", - formatUsecTime(packetSentTimeGaps.getMin()).toLatin1().data(), - formatUsecTime(packetSentTimeGaps.getMax()).toLatin1().data(), - formatUsecTime(packetSentTimeGaps.getAverage()).toLatin1().data()); - verticalOffset += STATS_HEIGHT_PER_LINE; - drawText(horizontalOffset, verticalOffset, scale, rotation, font, stringBuffer, color); - - sprintf(stringBuffer, " Inter-packet timegaps (last 30s) | min: %9s, max: %9s, avg: %9s", - formatUsecTime(packetSentTimeGaps.getWindowMin()).toLatin1().data(), - formatUsecTime(packetSentTimeGaps.getWindowMax()).toLatin1().data(), - formatUsecTime(packetSentTimeGaps.getWindowAverage()).toLatin1().data()); - verticalOffset += STATS_HEIGHT_PER_LINE; - drawText(horizontalOffset, verticalOffset, scale, rotation, font, stringBuffer, color); - - verticalOffset += STATS_HEIGHT_PER_LINE; // blank line - - char upstreamMicLabelString[] = "Upstream mic audio stats (received and reported by audio-mixer):"; - verticalOffset += STATS_HEIGHT_PER_LINE; - drawText(horizontalOffset, verticalOffset, scale, rotation, font, upstreamMicLabelString, color); - - renderAudioStreamStats(&_stats->getMixerAvatarStreamStats(), horizontalOffset, verticalOffset, - scale, rotation, font, color); - - - verticalOffset += STATS_HEIGHT_PER_LINE; // blank line - - char downstreamLabelString[] = "Downstream mixed audio stats:"; - verticalOffset += STATS_HEIGHT_PER_LINE; - drawText(horizontalOffset, verticalOffset, scale, rotation, font, downstreamLabelString, color); - - AudioStreamStats downstreamStats = _stats->getMixerDownstreamStats(); - renderAudioStreamStats(&downstreamStats, horizontalOffset, verticalOffset, - scale, rotation, font, color, true); - - - if (_shouldShowInjectedStreams) { - - foreach(const AudioStreamStats& injectedStreamAudioStats, _stats->getMixerInjectedStreamStatsMap()) { - - verticalOffset += STATS_HEIGHT_PER_LINE; // blank line - - char upstreamInjectedLabelString[512]; - sprintf(upstreamInjectedLabelString, "Upstream injected audio stats: stream ID: %s", - injectedStreamAudioStats._streamIdentifier.toString().toLatin1().data()); - verticalOffset += STATS_HEIGHT_PER_LINE; - drawText(horizontalOffset, verticalOffset, scale, rotation, font, upstreamInjectedLabelString, color); - - renderAudioStreamStats(&injectedStreamAudioStats, horizontalOffset, verticalOffset, scale, rotation, font, color); - } - } -} - -void AudioIOStatsRenderer::renderAudioStreamStats(const AudioStreamStats* streamStats, int horizontalOffset, int& verticalOffset, - float scale, float rotation, int font, const float* color, bool isDownstreamStats) { - - char stringBuffer[512]; - - sprintf(stringBuffer, " Packet loss | overall: %5.2f%% (%d lost), last_30s: %5.2f%% (%d lost)", - (double)(streamStats->_packetStreamStats.getLostRate() * 100.0f), - streamStats->_packetStreamStats._lost, - (double)(streamStats->_packetStreamWindowStats.getLostRate() * 100.0f), - streamStats->_packetStreamWindowStats._lost); - verticalOffset += STATS_HEIGHT_PER_LINE; - drawText(horizontalOffset, verticalOffset, scale, rotation, font, stringBuffer, color); - - if (isDownstreamStats) { - sprintf(stringBuffer, " Ringbuffer frames | desired: %u, avg_available(10s): %u+%d, available: %u+%d", - streamStats->_desiredJitterBufferFrames, - streamStats->_framesAvailableAverage, - (int)((float)_stats->getAudioInputMsecsReadStats().getWindowAverage() / AudioConstants::NETWORK_FRAME_MSECS), - streamStats->_framesAvailable, - (int)(_stats->getAudioOutputMsecsUnplayedStats().getCurrentIntervalLastSample() - / AudioConstants::NETWORK_FRAME_MSECS)); - } else { - sprintf(stringBuffer, " Ringbuffer frames | desired: %u, avg_available(10s): %u, available: %u", - streamStats->_desiredJitterBufferFrames, - streamStats->_framesAvailableAverage, - streamStats->_framesAvailable); - } - - verticalOffset += STATS_HEIGHT_PER_LINE; - drawText(horizontalOffset, verticalOffset, scale, rotation, font, stringBuffer, color); - - sprintf(stringBuffer, " Ringbuffer stats | starves: %u, prev_starve_lasted: %u, frames_dropped: %u, overflows: %u", - streamStats->_starveCount, - streamStats->_consecutiveNotMixedCount, - streamStats->_framesDropped, - streamStats->_overflowCount); - verticalOffset += STATS_HEIGHT_PER_LINE; - drawText(horizontalOffset, verticalOffset, scale, rotation, font, stringBuffer, color); - - sprintf(stringBuffer, " Inter-packet timegaps (overall) | min: %9s, max: %9s, avg: %9s", - formatUsecTime(streamStats->_timeGapMin).toLatin1().data(), - formatUsecTime(streamStats->_timeGapMax).toLatin1().data(), - formatUsecTime(streamStats->_timeGapAverage).toLatin1().data()); - verticalOffset += STATS_HEIGHT_PER_LINE; - drawText(horizontalOffset, verticalOffset, scale, rotation, font, stringBuffer, color); - - sprintf(stringBuffer, " Inter-packet timegaps (last 30s) | min: %9s, max: %9s, avg: %9s", - formatUsecTime(streamStats->_timeGapWindowMin).toLatin1().data(), - formatUsecTime(streamStats->_timeGapWindowMax).toLatin1().data(), - formatUsecTime(streamStats->_timeGapWindowAverage).toLatin1().data()); - verticalOffset += STATS_HEIGHT_PER_LINE; - drawText(horizontalOffset, verticalOffset, scale, rotation, font, stringBuffer, color); -} diff --git a/interface/src/audio/AudioIOStatsRenderer.h b/interface/src/audio/AudioIOStatsRenderer.h deleted file mode 100644 index 79d177e252..0000000000 --- a/interface/src/audio/AudioIOStatsRenderer.h +++ /dev/null @@ -1,45 +0,0 @@ -// -// AudioIOStatsRenderer.h -// interface/src/audio -// -// Created by Stephen Birarda on 2014-12-16. -// Copyright 2014 High Fidelity, Inc. -// -// Distributed under the Apache License, Version 2.0. -// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html -// - -#ifndef hifi_AudioIOStatsRenderer_h -#define hifi_AudioIOStatsRenderer_h - -#include - -#include - -class AudioIOStats; -class AudioStreamStats; - -class AudioIOStatsRenderer : public QObject, public Dependency { - Q_OBJECT - SINGLETON_DEPENDENCY -public: - void render(const float* color, int width, int height); - -public slots: - void toggle() { _isEnabled = !_isEnabled; } - void toggleShowInjectedStreams() { _shouldShowInjectedStreams = !_shouldShowInjectedStreams; } -protected: - AudioIOStatsRenderer(); -private: - // audio stats methods for rendering - void renderAudioStreamStats(const AudioStreamStats* streamStats, int horizontalOffset, int& verticalOffset, - float scale, float rotation, int font, const float* color, bool isDownstreamStats = false); - - const AudioIOStats* _stats; - - bool _isEnabled; - bool _shouldShowInjectedStreams; -}; - - -#endif // hifi_AudioIOStatsRenderer_h \ No newline at end of file diff --git a/interface/src/ui/ApplicationOverlay.cpp b/interface/src/ui/ApplicationOverlay.cpp index b28c5c83a2..63dcba9d5d 100644 --- a/interface/src/ui/ApplicationOverlay.cpp +++ b/interface/src/ui/ApplicationOverlay.cpp @@ -27,7 +27,6 @@ #include #include "AudioClient.h" -#include "audio/AudioIOStatsRenderer.h" #include "audio/AudioScope.h" #include "Application.h" #include "ApplicationOverlay.h"