eeva/jamulus
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fix for auto jitter buffer setting

Browse source
This commit is contained in:
Volker Fischer 2009-03-04 21:11:48 +00:00
parent 5cbf5cfd13
commit 22ab17e84f
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/client.cpp
View file

@ -380,7 +380,8 @@ void CClient::UpdateTimeResponseMeasurement()
// we want to calculate the standard deviation (we assume that the mean // we want to calculate the standard deviation (we assume that the mean
// is correct at the block period time) // is correct at the block period time)
const double dCurAddVal = const double dCurAddVal =
( (double) ( CurTime - TimeLastBlock ) - MIN_SERVER_BLOCK_DURATION_MS ); ( (double) ( CurTime - TimeLastBlock ) -
(double) iMonoBlockSizeSam / SYSTEM_SAMPLE_RATE * 1000 );
RespTimeMoAvBuf.Add ( dCurAddVal * dCurAddVal ); // add squared value RespTimeMoAvBuf.Add ( dCurAddVal * dCurAddVal ); // add squared value
@ -394,7 +395,7 @@ void CClient::UpdateSocketBufferSize()
// do nothing // do nothing
if ( bDoAutoSockBufSize ) if ( bDoAutoSockBufSize )
{ {
// we use the time response measurement for the automatic setting // We use the time response measurement for the automatic setting.
// Assumptions: // Assumptions:
// - the network jitter can be neglected compared to the audio // - the network jitter can be neglected compared to the audio
// interface jitter // interface jitter
@ -412,9 +413,17 @@ void CClient::UpdateSocketBufferSize()
{ {
// calculate current buffer setting // calculate current buffer setting
// TODO 2* seems not give optimal results, maybe use 3*? // TODO 2* seems not give optimal results, maybe use 3*?
// TEST add 2 buffers
// add .5 to "round up" -> ceil // add .5 to "round up" -> ceil
const double dEstCurBufSet = 2 * ( GetTimingStdDev() + 0.5 ) + 2; // divide by MIN_SERVER_BLOCK_DURATION_MS because this is the size of
// one block in the jitter buffer
// TODO use max(audioMs, receivedNetpacketsMs)
const double dAudioBufferDurationMs =
iMonoBlockSizeSam / SYSTEM_SAMPLE_RATE * 1000;
const double dEstCurBufSet = ( dAudioBufferDurationMs +
3 * ( GetTimingStdDev() + 0.5 ) ) /
MIN_SERVER_BLOCK_DURATION_MS;
// upper/lower hysteresis decision // upper/lower hysteresis decision
const int iUpperHystDec = LlconMath().round ( dEstCurBufSet - dHysteresis ); const int iUpperHystDec = LlconMath().round ( dEstCurBufSet - dHysteresis );