diff --git a/assignment-client/src/audio/AudioMixerClientData.cpp b/assignment-client/src/audio/AudioMixerClientData.cpp index b2a92efb25..2f377b3d0f 100644 --- a/assignment-client/src/audio/AudioMixerClientData.cpp +++ b/assignment-client/src/audio/AudioMixerClientData.cpp @@ -236,7 +236,7 @@ QString AudioMixerClientData::getAudioStreamStatsString() const { int desiredJitterBuffer = avatarRingBuffer->getDesiredJitterBufferFrames(); int calculatedJitterBuffer = avatarRingBuffer->getCalculatedDesiredJitterBufferFrames(); int currentJitterBuffer = avatarRingBuffer->getCurrentJitterBufferFrames(); - int resetCount = avatarRingBuffer->getResetCount(); + int overflowCount = avatarRingBuffer->getOverflowCount(); int samplesAvailable = avatarRingBuffer->samplesAvailable(); int framesAvailable = (samplesAvailable / avatarRingBuffer->getSamplesPerFrame()); result += "mic.desired:" + QString::number(desiredJitterBuffer) @@ -244,7 +244,7 @@ QString AudioMixerClientData::getAudioStreamStatsString() const { + " current:" + QString::number(currentJitterBuffer) + " available:" + QString::number(framesAvailable) + " samples:" + QString::number(samplesAvailable) - + " resets:" + QString::number(resetCount); + + " overflows:" + QString::number(overflowCount); } else { result = "mic unknown"; } @@ -254,7 +254,7 @@ QString AudioMixerClientData::getAudioStreamStatsString() const { int desiredJitterBuffer = _ringBuffers[i]->getDesiredJitterBufferFrames(); int calculatedJitterBuffer = _ringBuffers[i]->getCalculatedDesiredJitterBufferFrames(); int currentJitterBuffer = _ringBuffers[i]->getCurrentJitterBufferFrames(); - int resetCount = _ringBuffers[i]->getResetCount(); + int overflowCount = _ringBuffers[i]->getOverflowCount(); int samplesAvailable = _ringBuffers[i]->samplesAvailable(); int framesAvailable = (samplesAvailable / _ringBuffers[i]->getSamplesPerFrame()); getAudioStreamStatsOfStream(_ringBuffers[i], streamStats); @@ -263,7 +263,7 @@ QString AudioMixerClientData::getAudioStreamStatsString() const { + " current:" + QString::number(currentJitterBuffer) + " available:" + QString::number(framesAvailable) + " samples:" + QString::number(samplesAvailable) - + " resets:" + QString::number(resetCount) + + " overflows:" + QString::number(overflowCount) + " early:" + QString::number(streamStats._packetsEarly) + " late:" + QString::number(streamStats._packetsLate) + " lost:" + QString::number(streamStats._packetsLost); diff --git a/libraries/audio/src/AudioRingBuffer.cpp b/libraries/audio/src/AudioRingBuffer.cpp index 07b48fe88d..11219771cf 100644 --- a/libraries/audio/src/AudioRingBuffer.cpp +++ b/libraries/audio/src/AudioRingBuffer.cpp @@ -21,7 +21,7 @@ AudioRingBuffer::AudioRingBuffer(int numFrameSamples, bool randomAccessMode) : NodeData(), - _resetCount(0), + _overflowCount(0), _sampleCapacity(numFrameSamples * RING_BUFFER_LENGTH_FRAMES), _numFrameSamples(numFrameSamples), _isStarved(true), diff --git a/libraries/audio/src/AudioRingBuffer.h b/libraries/audio/src/AudioRingBuffer.h index b290c96d79..8d19f9c0bb 100644 --- a/libraries/audio/src/AudioRingBuffer.h +++ b/libraries/audio/src/AudioRingBuffer.h @@ -71,7 +71,7 @@ public: bool isStarved() const { return _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; } int addSilentFrame(int numSilentSamples); @@ -82,7 +82,7 @@ protected: 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; bool _isFull;