From 28ac0cbdfc09140035df665ddbbd6fa6ec7b2b73 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Tue, 12 Mar 2013 12:15:14 -0700 Subject: [PATCH] remove mixer smart thresholding for flange testing --- mixer/src/main.cpp | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/mixer/src/main.cpp b/mixer/src/main.cpp index 1f149b7f38..b2d5245707 100644 --- a/mixer/src/main.cpp +++ b/mixer/src/main.cpp @@ -21,7 +21,7 @@ const unsigned short MIXER_LISTEN_PORT = 55443; const float SAMPLE_RATE = 22050.0; -const short JITTER_BUFFER_MSECS = 12; +const short JITTER_BUFFER_MSECS = 5; const short JITTER_BUFFER_SAMPLES = JITTER_BUFFER_MSECS * (SAMPLE_RATE / 1000.0); const int BUFFER_LENGTH_BYTES = 1024; @@ -81,22 +81,6 @@ void *sendBuffer(void *args) printf("Buffer %d starved.\n", i); agentBuffer->setStarted(false); } else { - - // check if we have more than we need to play out - int thresholdFrames = ceilf((BUFFER_LENGTH_SAMPLES_PER_CHANNEL + JITTER_BUFFER_SAMPLES) / (float)BUFFER_LENGTH_SAMPLES_PER_CHANNEL); - int thresholdSamples = thresholdFrames * BUFFER_LENGTH_SAMPLES_PER_CHANNEL; - - if (agentBuffer->diffLastWriteNextOutput() > thresholdSamples) { - // we need to push the next output forwards - int samplesToPush = agentBuffer->diffLastWriteNextOutput() - thresholdSamples; - - if (agentBuffer->getNextOutput() + samplesToPush > agentBuffer->getBuffer()) { - agentBuffer->setNextOutput(agentBuffer->getBuffer() + (samplesToPush - (agentBuffer->getBuffer() + RING_BUFFER_SAMPLES - agentBuffer->getNextOutput()))); - } else { - agentBuffer->setNextOutput(agentBuffer->getNextOutput() + samplesToPush); - } - } - // good buffer, add this to the mix agentBuffer->setStarted(true); agentBuffer->setAddedToMix(true);