Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-23 01:04:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

moved jbufferstats class to PositionalAudioRingBuffers

Browse source
This commit is contained in:
wangyix 2014-06-25 09:52:02 -07:00
parent 99bc7f8c9d
commit 1257e0595a
6 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -161,9 +161,9 @@ void AudioMixerClientData::calculateJitterBuffersStats(AudioMixerJitterBuffersSt
sumJitterBufferFrames += bufferJitterFrames;
}
stats.avatarJitterBufferFrames = avatarJitterBufferFrames;
stats.maxJitterBufferFrames = maxJitterBufferFrames;
stats.avgJitterBufferFrames = (float)sumJitterBufferFrames / (float)_ringBuffers.size();
stats._avatarJitterBufferFrames = avatarJitterBufferFrames;
stats._maxJitterBufferFrames = maxJitterBufferFrames;
stats._avgJitterBufferFrames = (float)sumJitterBufferFrames / (float)_ringBuffers.size();
}
QString AudioMixerClientData::getJitterBufferStats() const {

11
assignment-client/src/audio/AudioMixerClientData.h
View file

@ -18,17 +18,6 @@
#include "AvatarAudioRingBuffer.h"
class AudioMixerJitterBuffersStats {
public:
AudioMixerJitterBuffersStats()
: avatarJitterBufferFrames(0), maxJitterBufferFrames(0), avgJitterBufferFrames(0)
{}
int avatarJitterBufferFrames;
int maxJitterBufferFrames;
float avgJitterBufferFrames;
};
class AudioMixerClientData : public NodeData {
public:
AudioMixerClientData();

2
interface/src/Audio.h
View file

@ -16,7 +16,7 @@
#include <vector>
#include "InterfaceConfig.h"
#include "../../assignment-client/src/audio/AudioMixerClientData.h"
#include "PositionalAudioRingBuffer.h"
#include <QAudio>
#include <QAudioInput>

4
interface/src/ui/Stats.cpp
View file

@ -330,8 +330,8 @@ void Stats::display(
char* audioMixerJitterBuffersStatsLabel = "AudioMixer j-buffers msecs:";
char audioMixerJitterBuffersStats[30];
sprintf(audioMixerJitterBuffersStats, "mic/max/avg: %.1f / %.1f / %.1f", audioMixerJitterBufferStats.avatarJitterBufferFrames * MSECS_PER_FRAME,
audioMixerJitterBufferStats.maxJitterBufferFrames * MSECS_PER_FRAME, audioMixerJitterBufferStats.avgJitterBufferFrames * MSECS_PER_FRAME);
sprintf(audioMixerJitterBuffersStats, "mic/max/avg: %.1f / %.1f / %.1f", audioMixerJitterBufferStats._avatarJitterBufferFrames * MSECS_PER_FRAME,
audioMixerJitterBufferStats._maxJitterBufferFrames * MSECS_PER_FRAME, audioMixerJitterBufferStats._avgJitterBufferFrames * MSECS_PER_FRAME);
verticalOffset += STATS_PELS_PER_LINE;
drawText(horizontalOffset, verticalOffset, scale, rotation, font, audioMixerJitterBuffersStatsLabel, color);

2
libraries/audio/src/AudioRingBuffer.cpp
View file

@ -16,9 +16,9 @@
#include <QtCore/QDebug>
#include "PacketHeaders.h"
#include "../../../assignment-client/src/audio/AudioMixerClientData.h"
#include "AudioRingBuffer.h"
#include "PositionalAudioRingBuffer.h"
AudioRingBuffer::AudioRingBuffer(int numFrameSamples, bool randomAccessMode) :
NodeData(),

11
libraries/audio/src/PositionalAudioRingBuffer.h
View file

@ -43,6 +43,17 @@ private:
bool _newWindowMaxGapAvailable;
};
class AudioMixerJitterBuffersStats {
public:
AudioMixerJitterBuffersStats()
: _avatarJitterBufferFrames(0), _maxJitterBufferFrames(0), _avgJitterBufferFrames(0)
{}
int _avatarJitterBufferFrames;
int _maxJitterBufferFrames;
float _avgJitterBufferFrames;
};
class PositionalAudioRingBuffer : public AudioRingBuffer {
public:
enum Type {