From 0dd2406f9dbc3cfdc4a1081b85a07301d6f3843f Mon Sep 17 00:00:00 2001 From: Volker Fischer Date: Thu, 16 Jun 2011 11:33:58 +0000 Subject: [PATCH] some clean up --- src/buffer.h | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/buffer.h b/src/buffer.h index 7ce3f50d..1a21cc06 100755 --- a/src/buffer.h +++ b/src/buffer.h @@ -31,8 +31,8 @@ /* Definitions ****************************************************************/ // each regular buffer access lead to a count for put and get, assuming 2.66 ms -// blocks we have 2 * 60 s / 2.66 ms * 2 = 90000 -#define MAX_STATISTIC_COUNT 90000 +// blocks we have 15 s / 2.66 ms * 2 = approx. 11000 +#define MAX_STATISTIC_COUNT 11000 // number of simulation network jitter buffers for evaluating the statistic #define NUM_STAT_SIMULATION_BUFFERS 13 @@ -395,16 +395,24 @@ public: virtual bool Put ( const CVector& vecbyData, const int iInSize ); virtual bool Get ( CVector& vecbyData ); + int GetAutoSetting() { return iCurAutoBufferSizeSetting; } + // TEST void StoreAllSimAverages(); -int GetAutoSetting(); protected: + void UpdateAutoSetting(); + // statistic (do not use the vector class since the classes do not have // appropriate copy constructor/operator) CErrorRate ErrorRateStatistic[NUM_STAT_SIMULATION_BUFFERS]; CNetBuf SimulationBuffer[NUM_STAT_SIMULATION_BUFFERS]; int viBufSizesForSim[NUM_STAT_SIMULATION_BUFFERS]; + + double dCurIIRFilterResult; + int iCurDecidedResult; + int iInitCounter; + int iCurAutoBufferSizeSetting; };