Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-26 07:56:32 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

_resetCount to _overflowCount in AudioRingBuffer

Browse source
This commit is contained in:
wangyix 2014-06-30 14:21:38 -07:00
parent c789f3c6b9
commit 6b6dccda2f
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -236,7 +236,7 @@ QString AudioMixerClientData::getAudioStreamStatsString() const {
int desiredJitterBuffer = avatarRingBuffer->getDesiredJitterBufferFrames(); int desiredJitterBuffer = avatarRingBuffer->getDesiredJitterBufferFrames();
int calculatedJitterBuffer = avatarRingBuffer->getCalculatedDesiredJitterBufferFrames(); int calculatedJitterBuffer = avatarRingBuffer->getCalculatedDesiredJitterBufferFrames();
int currentJitterBuffer = avatarRingBuffer->getCurrentJitterBufferFrames(); int currentJitterBuffer = avatarRingBuffer->getCurrentJitterBufferFrames();
int resetCount = avatarRingBuffer->getResetCount(); int overflowCount = avatarRingBuffer->getOverflowCount();
int samplesAvailable = avatarRingBuffer->samplesAvailable(); int samplesAvailable = avatarRingBuffer->samplesAvailable();
int framesAvailable = (samplesAvailable / avatarRingBuffer->getSamplesPerFrame()); int framesAvailable = (samplesAvailable / avatarRingBuffer->getSamplesPerFrame());
result += "mic.desired:" + QString::number(desiredJitterBuffer) result += "mic.desired:" + QString::number(desiredJitterBuffer)
@ -244,7 +244,7 @@ QString AudioMixerClientData::getAudioStreamStatsString() const {
+ " current:" + QString::number(currentJitterBuffer) + " current:" + QString::number(currentJitterBuffer)
+ " available:" + QString::number(framesAvailable) + " available:" + QString::number(framesAvailable)
+ " samples:" + QString::number(samplesAvailable) + " samples:" + QString::number(samplesAvailable)
+ " resets:" + QString::number(resetCount); + " overflows:" + QString::number(overflowCount);
} else { } else {
result = "mic unknown"; result = "mic unknown";
} }
@ -254,7 +254,7 @@ QString AudioMixerClientData::getAudioStreamStatsString() const {
int desiredJitterBuffer = _ringBuffers[i]->getDesiredJitterBufferFrames(); int desiredJitterBuffer = _ringBuffers[i]->getDesiredJitterBufferFrames();
int calculatedJitterBuffer = _ringBuffers[i]->getCalculatedDesiredJitterBufferFrames(); int calculatedJitterBuffer = _ringBuffers[i]->getCalculatedDesiredJitterBufferFrames();
int currentJitterBuffer = _ringBuffers[i]->getCurrentJitterBufferFrames(); int currentJitterBuffer = _ringBuffers[i]->getCurrentJitterBufferFrames();
int resetCount = _ringBuffers[i]->getResetCount(); int overflowCount = _ringBuffers[i]->getOverflowCount();
int samplesAvailable = _ringBuffers[i]->samplesAvailable(); int samplesAvailable = _ringBuffers[i]->samplesAvailable();
int framesAvailable = (samplesAvailable / _ringBuffers[i]->getSamplesPerFrame()); int framesAvailable = (samplesAvailable / _ringBuffers[i]->getSamplesPerFrame());
getAudioStreamStatsOfStream(_ringBuffers[i], streamStats); getAudioStreamStatsOfStream(_ringBuffers[i], streamStats);
@ -263,7 +263,7 @@ QString AudioMixerClientData::getAudioStreamStatsString() const {
+ " current:" + QString::number(currentJitterBuffer) + " current:" + QString::number(currentJitterBuffer)
+ " available:" + QString::number(framesAvailable) + " available:" + QString::number(framesAvailable)
+ " samples:" + QString::number(samplesAvailable) + " samples:" + QString::number(samplesAvailable)
+ " resets:" + QString::number(resetCount) + " overflows:" + QString::number(overflowCount)
+ " early:" + QString::number(streamStats._packetsEarly) + " early:" + QString::number(streamStats._packetsEarly)
+ " late:" + QString::number(streamStats._packetsLate) + " late:" + QString::number(streamStats._packetsLate)
+ " lost:" + QString::number(streamStats._packetsLost); + " lost:" + QString::number(streamStats._packetsLost);

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

@ -21,7 +21,7 @@
AudioRingBuffer::AudioRingBuffer(int numFrameSamples, bool randomAccessMode) : AudioRingBuffer::AudioRingBuffer(int numFrameSamples, bool randomAccessMode) :
NodeData(), NodeData(),
_resetCount(0), _overflowCount(0),
_sampleCapacity(numFrameSamples * RING_BUFFER_LENGTH_FRAMES), _sampleCapacity(numFrameSamples * RING_BUFFER_LENGTH_FRAMES),
_numFrameSamples(numFrameSamples), _numFrameSamples(numFrameSamples),
_isStarved(true), _isStarved(true),

4
libraries/audio/src/AudioRingBuffer.h
View file

@ -71,7 +71,7 @@ public:
bool isStarved() const { return _isStarved; } bool isStarved() const { return _isStarved; }
void setIsStarved(bool isStarved) { _isStarved = isStarved; } void setIsStarved(bool isStarved) { _isStarved = isStarved; }
int getResetCount() const { return _resetCount; } /// how many times has the ring buffer written past the end and reset int getOverflowCount() const { return _overflowCount; } /// how many times has the ring buffer has overwritten old data
bool hasStarted() const { return _hasStarted; } bool hasStarted() const { return _hasStarted; }
int addSilentFrame(int numSilentSamples); int addSilentFrame(int numSilentSamples);
@ -82,7 +82,7 @@ protected:
int16_t* shiftedPositionAccomodatingWrap(int16_t* position, int numSamplesShift) const; int16_t* shiftedPositionAccomodatingWrap(int16_t* position, int numSamplesShift) const;
int _resetCount; /// how many times has the ring buffer written past the end and done a reset int _overflowCount; /// how many times has the ring buffer has overwritten old data
int _sampleCapacity; int _sampleCapacity;
bool _isFull; bool _isFull;