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

forgot arg in AudioRingBuffer constructor in PositionalAudioRingBUffer

Browse source 
changed _currentJitterBufferFrames to be -1 to indicate starved.
This commit is contained in:
wangyix 2014-07-03 11:34:16 -07:00
parent 507518f16d
commit 2c6b2000b2
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libraries/audio/src/PositionalAudioRingBuffer.cpp
View file

@ -88,7 +88,7 @@ quint64 InterframeTimeGapStats::getWindowMaxGap() {
PositionalAudioRingBuffer::PositionalAudioRingBuffer(PositionalAudioRingBuffer::Type type, bool isStereo, bool dynamicJitterBuffers) : PositionalAudioRingBuffer::PositionalAudioRingBuffer(PositionalAudioRingBuffer::Type type, bool isStereo, bool dynamicJitterBuffers) :
AudioRingBuffer(isStereo ? NETWORK_BUFFER_LENGTH_SAMPLES_STEREO : NETWORK_BUFFER_LENGTH_SAMPLES_PER_CHANNEL, AudioRingBuffer(isStereo ? NETWORK_BUFFER_LENGTH_SAMPLES_STEREO : NETWORK_BUFFER_LENGTH_SAMPLES_PER_CHANNEL,
AUDIOMIXER_INBOUND_RING_BUFFER_FRAME_CAPACITY), false, AUDIOMIXER_INBOUND_RING_BUFFER_FRAME_CAPACITY),
_type(type), _type(type),
_position(0.0f, 0.0f, 0.0f), _position(0.0f, 0.0f, 0.0f),
_orientation(0.0f, 0.0f, 0.0f, 0.0f), _orientation(0.0f, 0.0f, 0.0f, 0.0f),
@ -98,7 +98,7 @@ PositionalAudioRingBuffer::PositionalAudioRingBuffer(PositionalAudioRingBuffer::
_isStereo(isStereo), _isStereo(isStereo),
_listenerUnattenuatedZone(NULL), _listenerUnattenuatedZone(NULL),
_desiredJitterBufferFrames(1), _desiredJitterBufferFrames(1),
_currentJitterBufferFrames(0), _currentJitterBufferFrames(-1),
_dynamicJitterBuffers(dynamicJitterBuffers) _dynamicJitterBuffers(dynamicJitterBuffers)
{ {
} }
@ -216,8 +216,8 @@ bool PositionalAudioRingBuffer::shouldBeAddedToMix() {
// if the buffer doesn't have a full frame of samples to take for mixing, it is starved // if the buffer doesn't have a full frame of samples to take for mixing, it is starved
_isStarved = true; _isStarved = true;
// set to 0 to indicate the jitter buffer is starved // set to -1 to indicate the jitter buffer is starved
_currentJitterBufferFrames = 0; _currentJitterBufferFrames = -1;
// reset our _shouldOutputStarveDebug to true so the next is printed // reset our _shouldOutputStarveDebug to true so the next is printed
_shouldOutputStarveDebug = true; _shouldOutputStarveDebug = true;

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

@ -105,6 +105,11 @@ protected:
int _desiredJitterBufferFrames; int _desiredJitterBufferFrames;
int _currentJitterBufferFrames; int _currentJitterBufferFrames;
bool _dynamicJitterBuffers; bool _dynamicJitterBuffers;
// extra stats
int _starveCount;
int _silentFramesDropped;
}; };
#endif // hifi_PositionalAudioRingBuffer_h #endif // hifi_PositionalAudioRingBuffer_h