Merge pull request #3065 from ZappoMan/serverSideAudioMixerStats

remove resizing of jitter buffers for now, only ask for 1 frame
This commit is contained in:
Brad Hefta-Gaub 2014-06-23 18:54:18 -07:00
commit fc88b1f710

View file

@ -234,11 +234,12 @@ bool PositionalAudioRingBuffer::shouldBeAddedToMix() {
}
void PositionalAudioRingBuffer::updateDesiredJitterBufferFrames() {
const float USECS_PER_FRAME = NETWORK_BUFFER_LENGTH_SAMPLES_PER_CHANNEL * USECS_PER_SECOND / (float)SAMPLE_RATE;
if (_interframeTimeGapStats.hasNewWindowMaxGapAvailable()) {
_desiredJitterBufferFrames = 1; // HACK to see if this fixes the audio silence
/*
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);
if (_desiredJitterBufferFrames < 1) {
_desiredJitterBufferFrames = 1;
@ -247,5 +248,6 @@ void PositionalAudioRingBuffer::updateDesiredJitterBufferFrames() {
if (_desiredJitterBufferFrames > maxDesired) {
_desiredJitterBufferFrames = maxDesired;
}
*/
}
}