mirror of
https://github.com/HifiExperiments/overte.git
synced 2025-08-09 16:30:16 +02:00
Start on refactoring of bandwidth metrics
This commit is contained in:
parent
2999a77f87
commit
dd9d054286
2 changed files with 118 additions and 0 deletions
63
interface/src/BandwidthRecorder.cpp
Normal file
63
interface/src/BandwidthRecorder.cpp
Normal file
|
@ -0,0 +1,63 @@
|
||||||
|
//
|
||||||
|
// BandwidthMeter.cpp
|
||||||
|
// interface/src/ui
|
||||||
|
//
|
||||||
|
// Created by Seth Alves on 2015-1-30
|
||||||
|
// Copyright 2015 High Fidelity, Inc.
|
||||||
|
//
|
||||||
|
// Based on code by Tobias Schwinger
|
||||||
|
//
|
||||||
|
// Distributed under the Apache License, Version 2.0.
|
||||||
|
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
|
||||||
|
//
|
||||||
|
|
||||||
|
#include <GeometryCache.h>
|
||||||
|
#include "BandwidthRecorder.h"
|
||||||
|
|
||||||
|
|
||||||
|
BandwidthRecorder::Channel::Channel(char const* const caption,
|
||||||
|
char const* unitCaption,
|
||||||
|
double unitScale,
|
||||||
|
unsigned colorRGBA) :
|
||||||
|
caption(caption),
|
||||||
|
unitCaption(unitCaption),
|
||||||
|
unitScale(unitScale),
|
||||||
|
colorRGBA(colorRGBA)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
BandwidthRecorder::BandwidthRecorder() {
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
BandwidthRecorder::~BandwidthRecorder() {
|
||||||
|
delete audioChannel;
|
||||||
|
delete avatarsChannel;
|
||||||
|
delete octreeChannel;
|
||||||
|
delete metavoxelsChannel;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
BandwidthRecorder::Stream::Stream(float msToAverage) : _value(0.0f), _msToAverage(msToAverage) {
|
||||||
|
_prevTime.start();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void BandwidthRecorder::Stream::updateValue(double amount) {
|
||||||
|
|
||||||
|
// Determine elapsed time
|
||||||
|
double dt = (double)_prevTime.nsecsElapsed() / 1000000.0; // ns to ms
|
||||||
|
|
||||||
|
// Ignore this value when timer imprecision yields dt = 0
|
||||||
|
if (dt == 0.0) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
_prevTime.start();
|
||||||
|
|
||||||
|
// Compute approximate average
|
||||||
|
_value = glm::mix(_value, amount / dt,
|
||||||
|
glm::clamp(dt / _msToAverage, 0.0, 1.0));
|
||||||
|
}
|
55
interface/src/BandwidthRecorder.h
Normal file
55
interface/src/BandwidthRecorder.h
Normal file
|
@ -0,0 +1,55 @@
|
||||||
|
//
|
||||||
|
// BandwidthRecorder.h
|
||||||
|
//
|
||||||
|
// Created by Seth Alves on 2015-1-30
|
||||||
|
// Copyright 2015 High Fidelity, Inc.
|
||||||
|
//
|
||||||
|
// Based on code by Tobias Schwinger
|
||||||
|
//
|
||||||
|
// 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_BandwidthRecorder_h
|
||||||
|
#define hifi_BandwidthRecorder_h
|
||||||
|
|
||||||
|
#include <QElapsedTimer>
|
||||||
|
|
||||||
|
class BandwidthRecorder {
|
||||||
|
public:
|
||||||
|
BandwidthRecorder();
|
||||||
|
~BandwidthRecorder();
|
||||||
|
|
||||||
|
// keep track of data rate in one direction
|
||||||
|
class Stream {
|
||||||
|
public:
|
||||||
|
Stream(float msToAverage = 3000.0f);
|
||||||
|
void updateValue(double amount);
|
||||||
|
double getValue() const { return _value; }
|
||||||
|
private:
|
||||||
|
double _value; // Current value.
|
||||||
|
double _msToAverage; // Milliseconds to average.
|
||||||
|
QElapsedTimer _prevTime; // Time of last feed.
|
||||||
|
};
|
||||||
|
|
||||||
|
// keep track of data rate in two directions as well as units and style to use during display
|
||||||
|
class Channel {
|
||||||
|
public:
|
||||||
|
Channel(char const* const caption, char const* unitCaption, double unitScale, unsigned colorRGBA);
|
||||||
|
Stream input;
|
||||||
|
Stream output;
|
||||||
|
char const* const caption;
|
||||||
|
char const* unitCaption;
|
||||||
|
double unitScale;
|
||||||
|
unsigned colorRGBA;
|
||||||
|
};
|
||||||
|
|
||||||
|
// create the channels we keep track of
|
||||||
|
Channel* audioChannel = new Channel("Audio", "Kbps", 8000.0 / 1024.0, 0x33cc99ff);
|
||||||
|
Channel* avatarsChannel = new Channel("Avatars", "Kbps", 8000.0 / 1024.0, 0xffef40c0);
|
||||||
|
Channel* octreeChannel = new Channel("Octree", "Kbps", 8000.0 / 1024.0, 0xd0d0d0a0);
|
||||||
|
Channel* metavoxelsChannel = new Channel("Metavoxels", "Kbps", 8000.0 / 1024.0, 0xd0d0d0a0);
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif
|
Loading…
Reference in a new issue