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

Merge branch 'master' of https://github.com/worklist/hifi

Browse source
This commit is contained in:
ZappoMan 2013-03-29 09:27:37 -07:00
commit 94754963ad
1 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
interface/src/Audio.cpp
View file

@ -264,19 +264,19 @@ int audioCallback (const void *inputBuffer,
} }
// check if we have more than we need to play out // check if we have more than we need to play out
int thresholdFrames = ceilf((PACKET_LENGTH_SAMPLES + JITTER_BUFFER_SAMPLES) / (float)PACKET_LENGTH_SAMPLES); // int thresholdFrames = ceilf((PACKET_LENGTH_SAMPLES + JITTER_BUFFER_SAMPLES) / (float)PACKET_LENGTH_SAMPLES);
int thresholdSamples = thresholdFrames * PACKET_LENGTH_SAMPLES; // int thresholdSamples = thresholdFrames * PACKET_LENGTH_SAMPLES;
//
if (ringBuffer->diffLastWriteNextOutput() > thresholdSamples) { // if (ringBuffer->diffLastWriteNextOutput() > thresholdSamples) {
// we need to push the next output forwards // // we need to push the next output forwards
int samplesToPush = ringBuffer->diffLastWriteNextOutput() - thresholdSamples; // int samplesToPush = ringBuffer->diffLastWriteNextOutput() - thresholdSamples;
//
if (ringBuffer->getNextOutput() + samplesToPush > ringBuffer->getBuffer()) { // if (ringBuffer->getNextOutput() + samplesToPush > ringBuffer->getBuffer()) {
ringBuffer->setNextOutput(ringBuffer->getBuffer() + (samplesToPush - (ringBuffer->getBuffer() + RING_BUFFER_SAMPLES - ringBuffer->getNextOutput()))); // ringBuffer->setNextOutput(ringBuffer->getBuffer() + (samplesToPush - (ringBuffer->getBuffer() + RING_BUFFER_SAMPLES - ringBuffer->getNextOutput())));
} else { // } else {
ringBuffer->setNextOutput(ringBuffer->getNextOutput() + samplesToPush); // ringBuffer->setNextOutput(ringBuffer->getNextOutput() + samplesToPush);
} // }
} // }
for (int s = 0; s < PACKET_LENGTH_SAMPLES_PER_CHANNEL; s++) { for (int s = 0; s < PACKET_LENGTH_SAMPLES_PER_CHANNEL; s++) {