From 14fc39ffa3426764de43f34e6564348a8f912242 Mon Sep 17 00:00:00 2001 From: Thijs Wenker Date: Sat, 26 Sep 2015 02:36:01 +0200 Subject: [PATCH 1/3] Added JS access to the variables Stats.audioPacketlossUpstream Stats.audioPacketlossDownstream Which contain a floating point with the value between 0.0f and 1.0f which is the percentage of packet loss. --- interface/src/ui/Stats.cpp | 1 + interface/src/ui/Stats.h | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/interface/src/ui/Stats.cpp b/interface/src/ui/Stats.cpp index ebce4f2b96..831664e3e6 100644 --- a/interface/src/ui/Stats.cpp +++ b/interface/src/ui/Stats.cpp @@ -46,6 +46,7 @@ Stats::Stats(QQuickItem* parent) : QQuickItem(parent) { INSTANCE = this; const QFont font = QFontDatabase::systemFont(QFontDatabase::FixedFont); _monospaceFont = font.family(); + _audioStats = &DependencyManager::get()->getStats(); } bool Stats::includeTimingRecord(const QString& name) { diff --git a/interface/src/ui/Stats.h b/interface/src/ui/Stats.h index 2e4c5e4dca..d6aa255dc6 100644 --- a/interface/src/ui/Stats.h +++ b/interface/src/ui/Stats.h @@ -12,6 +12,7 @@ #include #include #include +#include #define STATS_PROPERTY(type, name, initialValue) \ Q_PROPERTY(type name READ name NOTIFY name##Changed) \ @@ -27,6 +28,8 @@ class Stats : public QQuickItem { Q_PROPERTY(bool expanded READ isExpanded WRITE setExpanded NOTIFY expandedChanged) Q_PROPERTY(bool timingExpanded READ isTimingExpanded NOTIFY timingExpandedChanged) Q_PROPERTY(QString monospaceFont READ monospaceFont CONSTANT) + Q_PROPERTY(float audioPacketlossUpstream READ getAudioPacketLossUpstream) + Q_PROPERTY(float audioPacketlossDownstream READ getAudioPacketLossDownstream) STATS_PROPERTY(int, serverCount, 0) STATS_PROPERTY(int, framerate, 0) @@ -81,6 +84,10 @@ public: const QString& monospaceFont() { return _monospaceFont; } + + float getAudioPacketLossUpstream() { return _audioStats->getMixerAvatarStreamStats()._packetStreamStats.getLostRate(); } + float getAudioPacketLossDownstream() { return _audioStats->getMixerDownstreamStats()._packetStreamStats.getLostRate(); } + void updateStats(bool force = false); bool isExpanded() { return _expanded; } @@ -149,6 +156,7 @@ private: bool _expanded{ false }; bool _timingExpanded{ false }; QString _monospaceFont; + const AudioIOStats* _audioStats; }; #endif // hifi_Stats_h From b254353b38272344afaf16a1c8f5135747939483 Mon Sep 17 00:00:00 2001 From: "James B. Pollack" Date: Sat, 26 Sep 2015 07:09:41 -0700 Subject: [PATCH 2/3] Update collectHifiStats.js Clears the current batch after we send it to the endpoint. --- examples/example/misc/collectHifiStats.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/examples/example/misc/collectHifiStats.js b/examples/example/misc/collectHifiStats.js index 3902622217..8501fbb057 100644 --- a/examples/example/misc/collectHifiStats.js +++ b/examples/example/misc/collectHifiStats.js @@ -90,4 +90,5 @@ function sendBatchToEndpoint(batch) { var req = new XMLHttpRequest(); req.open("POST", ENDPOINT_URL, false); req.send(JSON.stringify(batch)); -} \ No newline at end of file + batch = []; +} From 203c601e95fcd1c1c320afaef62cc6e64b985222 Mon Sep 17 00:00:00 2001 From: Brad Davis Date: Mon, 28 Sep 2015 12:26:11 -0700 Subject: [PATCH 3/3] Fix for bad textures when using _glActiveBindTexture --- libraries/gpu/src/gpu/GLBackend.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libraries/gpu/src/gpu/GLBackend.cpp b/libraries/gpu/src/gpu/GLBackend.cpp index e8bc32d567..aac2d63a9b 100644 --- a/libraries/gpu/src/gpu/GLBackend.cpp +++ b/libraries/gpu/src/gpu/GLBackend.cpp @@ -418,6 +418,8 @@ void GLBackend::resetStages() { #define DO_IT_NOW(call, offset) void Batch::_glActiveBindTexture(GLenum unit, GLenum target, GLuint texture) { + setResourceTexture(unit - GL_TEXTURE0, nullptr); + ADD_COMMAND_GL(glActiveBindTexture); _params.push_back(texture);