reverted updateDesiredJitterBufferFrames to what Brad wrote

This commit is contained in:
wangyix 2014-06-25 11:42:03 -07:00
parent 591bfa14b9
commit dd1c157f3a

View file

@ -247,9 +247,12 @@ int PositionalAudioRingBuffer::getCalculatedDesiredJitterBufferFrames() const {
} }
void PositionalAudioRingBuffer::updateDesiredJitterBufferFrames() { void PositionalAudioRingBuffer::updateDesiredJitterBufferFrames() {
static const float USECS_PER_FRAME = NETWORK_BUFFER_LENGTH_SAMPLES_PER_CHANNEL * USECS_PER_SECOND / (float)SAMPLE_RATE;
if (_interframeTimeGapStats.hasNewWindowMaxGapAvailable()) { if (_interframeTimeGapStats.hasNewWindowMaxGapAvailable()) {
if (!_dynamicJitterBuffers) {
_desiredJitterBufferFrames = 1; // HACK to see if this fixes the audio silence
} else {
const float USECS_PER_FRAME = NETWORK_BUFFER_LENGTH_SAMPLES_PER_CHANNEL * USECS_PER_SECOND / (float)SAMPLE_RATE;
_desiredJitterBufferFrames = ceilf((float)_interframeTimeGapStats.getWindowMaxGap() / USECS_PER_FRAME); _desiredJitterBufferFrames = ceilf((float)_interframeTimeGapStats.getWindowMaxGap() / USECS_PER_FRAME);
if (_desiredJitterBufferFrames < 1) { if (_desiredJitterBufferFrames < 1) {
_desiredJitterBufferFrames = 1; _desiredJitterBufferFrames = 1;
@ -259,4 +262,5 @@ void PositionalAudioRingBuffer::updateDesiredJitterBufferFrames() {
_desiredJitterBufferFrames = maxDesired; _desiredJitterBufferFrames = maxDesired;
} }
} }
}
} }