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

some code cleanup

Browse source
This commit is contained in:
Volker Fischer 2011-06-30 19:51:15 +00:00
parent 93e12245fe
commit ade744c0e8
1 changed files with 18 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/buffer.cpp
View file

@ -162,7 +162,7 @@ void CNetBufWithStats::Init ( const int iNewBlockSize,
// init auto buffer setting with a meaningful value, also init the // init auto buffer setting with a meaningful value, also init the
// IIR parameter with this value // IIR parameter with this value
iCurAutoBufferSizeSetting = 5; iCurAutoBufferSizeSetting = 6;
dCurIIRFilterResult = iCurAutoBufferSizeSetting; dCurIIRFilterResult = iCurAutoBufferSizeSetting;
iCurDecidedResult = iCurAutoBufferSizeSetting; iCurDecidedResult = iCurAutoBufferSizeSetting;
} }
@ -199,25 +199,6 @@ bool CNetBufWithStats::Get ( CVector<uint8_t>& vecbyData )
// update auto setting // update auto setting
UpdateAutoSetting(); UpdateAutoSetting();
// TEST
// sometimes in the very first period after a connection we get a bad error
// rate result -> delete this from the initialization phase
const double dInitState =
ErrorRateStatistic[NUM_STAT_SIMULATION_BUFFERS - 1].InitializationState();
if ( ( dInitState > 0.15 ) && ( dInitState < 0.16 ) )
{
if ( ErrorRateStatistic[NUM_STAT_SIMULATION_BUFFERS - 1].GetAverage() > ERROR_RATE_BOUND )
{
for ( int i = 0; i < NUM_STAT_SIMULATION_BUFFERS; i++ )
{
ErrorRateStatistic[i].Reset();
}
}
}
return bGetOK; return bGetOK;
} }
@ -283,4 +264,21 @@ void CNetBufWithStats::UpdateAutoSetting()
LlconMath().DecideWithHysteresis ( dCurIIRFilterResult, LlconMath().DecideWithHysteresis ( dCurIIRFilterResult,
iCurDecidedResult, iCurDecidedResult,
dHysteresisValue ); dHysteresisValue );
// Initialization phase check and correction -------------------------------
// sometimes in the very first period after a connection we get a bad error
// rate result -> delete this from the initialization phase
if ( iInitCounter == MAX_STATISTIC_COUNT / 8 )
{
// check error rate of the largest buffer as the indicator
if ( ErrorRateStatistic[NUM_STAT_SIMULATION_BUFFERS - 1].
GetAverage() > ERROR_RATE_BOUND )
{
for ( int i = 0; i < NUM_STAT_SIMULATION_BUFFERS; i++ )
{
ErrorRateStatistic[i].Reset();
}
}
}
} }