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

properly reset nextOutput pointer to beginning on starve / full

Browse source
This commit is contained in:
Stephen Birarda 2013-02-04 16:00:37 -08:00
parent 72d4d073fd
commit 387100605c
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Source/Audio.cpp
View file

@ -25,7 +25,7 @@ const short PACKET_LENGTH_SAMPLES = PACKET_LENGTH_BYTES / sizeof(int16_t);
const int PHASE_DELAY_AT_90 = 20; const int PHASE_DELAY_AT_90 = 20;
const float AMPLITUDE_RATIO_AT_90 = 0.5; const float AMPLITUDE_RATIO_AT_90 = 0.5;
const short RING_BUFFER_FRAMES = 5; const short RING_BUFFER_FRAMES = 10;
const short RING_BUFFER_SIZE_SAMPLES = RING_BUFFER_FRAMES * BUFFER_LENGTH_SAMPLES; const short RING_BUFFER_SIZE_SAMPLES = RING_BUFFER_FRAMES * BUFFER_LENGTH_SAMPLES;
const short JITTER_BUFFER_LENGTH_MSECS = 1; const short JITTER_BUFFER_LENGTH_MSECS = 1;
@ -123,6 +123,7 @@ int audioCallback (const void *inputBuffer,
if (ringBuffer->diffLastWriteNextOutput() < BUFFER_LENGTH_SAMPLES) { if (ringBuffer->diffLastWriteNextOutput() < BUFFER_LENGTH_SAMPLES) {
std::cout << "Starved\n"; std::cout << "Starved\n";
ringBuffer->nextOutput = ringBuffer->buffer;
ringBuffer->endOfLastWrite = NULL; ringBuffer->endOfLastWrite = NULL;
} }
} }
@ -239,6 +240,7 @@ void *receiveAudioViaUDP(void *args) {
short bufferSampleOverlap = 0; short bufferSampleOverlap = 0;
if (!needsJitterBuffer && ringBuffer->diffLastWriteNextOutput() > RING_BUFFER_SIZE_SAMPLES - PACKET_LENGTH_SAMPLES) { if (!needsJitterBuffer && ringBuffer->diffLastWriteNextOutput() > RING_BUFFER_SIZE_SAMPLES - PACKET_LENGTH_SAMPLES) {
std::cout << "Full\n";
needsJitterBuffer = true; needsJitterBuffer = true;
} }
@ -257,14 +259,15 @@ void *receiveAudioViaUDP(void *args) {
if (!bufferSampleOverlap) { if (!bufferSampleOverlap) {
if (needsJitterBuffer) { if (needsJitterBuffer) {
// we need to inject a jitter buffer // we need to inject a jitter buffer
short jitterBufferSamples = JITTER_BUFFER_LENGTH_MSECS * (SAMPLE_RATE / 1000); short jitterBufferSamples = JITTER_BUFFER_LENGTH_MSECS * (SAMPLE_RATE / 1000.0);
// add silence for jitter buffer and then the received packet // add silence for jitter buffer and then the received packet
memset(copyToPointer, 0, jitterBufferSamples * sizeof(int16_t)); memset(copyToPointer, 0, jitterBufferSamples * sizeof(int16_t));
memcpy(copyToPointer + jitterBufferSamples, receivedData, PACKET_LENGTH_BYTES); memcpy(copyToPointer + jitterBufferSamples, receivedData, PACKET_LENGTH_BYTES);
// the end of the write is the pointer to the buffer + packet + jitter buffer // the end of the write is the pointer to the buffer + packet + jitter buffer
ringBuffer->endOfLastWrite = ringBuffer->buffer + PACKET_LENGTH_SAMPLES + jitterBufferSamples; ringBuffer->endOfLastWrite = ringBuffer->buffer + PACKET_LENGTH_SAMPLES + jitterBufferSamples;
ringBuffer->nextOutput = ringBuffer->buffer;
} else { } else {
// no jitter buffer, no overlap // no jitter buffer, no overlap
// just copy the recieved data to the right spot and then add packet length to previous pointer // just copy the recieved data to the right spot and then add packet length to previous pointer