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

small fix for auto jitter buffer setting

Browse source
This commit is contained in:
Volker Fischer 2009-03-18 07:24:53 +00:00
parent 9dd942bec6
commit 564d54f68c
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/channel.cpp
View file

@ -1130,7 +1130,10 @@ EPutDataStat CChannel::PutData ( const CVector<unsigned char>& vecbyData,
// re-initialization, too, if necessary // re-initialization, too, if necessary
if ( iAudioSize != CycleTimeVariance.GetBlockLength() ) if ( iAudioSize != CycleTimeVariance.GetBlockLength() )
{ {
// re-init // re-init (we have to use the buffer size which works
// on the system sample rate, therefore we use the
// decompressed audio buffer size instead of the network
// buffer size)
CycleTimeVariance.Init ( iAudioSize, TIME_MOV_AV_RESPONSE ); CycleTimeVariance.Init ( iAudioSize, TIME_MOV_AV_RESPONSE );
CycleTimeVariance.Reset(); CycleTimeVariance.Reset();
} }

10
src/client.cpp
View file

@ -443,11 +443,9 @@ void CClient::UpdateSocketBufferSize()
{ {
// 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 audio interface/network jitter is assumed to be Gaussian
// interface jitter // - the buffer size is set to 2.3 times the standard deviation of
// - the audio interface jitter is assumed to be Gaussian // the jitter (~90% of the jitter should be fit in the
// - the buffer size is set to two times the standard deviation of
// the audio interface jitter (~95% of the jitter should be fit in the
// buffer) // buffer)
// - introduce a hysteresis to avoid switching the buffer sizes all the // - introduce a hysteresis to avoid switching the buffer sizes all the
// time in case the time response measurement is close to a bound // time in case the time response measurement is close to a bound
@ -471,7 +469,7 @@ void CClient::UpdateSocketBufferSize()
// divide by MIN_SERVER_BLOCK_DURATION_MS because this is the size of // divide by MIN_SERVER_BLOCK_DURATION_MS because this is the size of
// one block in the jitter buffer // one block in the jitter buffer
const double dEstCurBufSet = ( dAudioBufferDurationMs + const double dEstCurBufSet = ( dAudioBufferDurationMs +
2 * ( Channel.GetTimingStdDev() + CycleTimeVariance.GetStdDev() + 0.5 ) ) / 2.3 * ( Channel.GetTimingStdDev() + CycleTimeVariance.GetStdDev() + 0.5 ) ) /
MIN_SERVER_BLOCK_DURATION_MS; MIN_SERVER_BLOCK_DURATION_MS;
// upper/lower hysteresis decision // upper/lower hysteresis decision