some fixes, added test code for jitter buffer initialization (not yet enabled)

src/buffer.cpp

@@ -231,34 +231,50 @@ int CNetBuf::GetAvailData() const
 
 void CNetBuf::Clear ( const EClearType eClearType )
 {
-    int iMiddleOfBuffer = 0;
+// TEST defines
+const bool bUseRandomInit           = false;
+const int  iNumBlocksBoundForRandom = 6;
+
+    int iNewFillLevel = 0;
 
     if ( iBlockSize != 0 )
     {
-        // with the following operation we set the new get pos to a block
+        // with the following operation we set the fill level to a block
         // boundary (one block below the middle of the buffer in case of odd
         // number of blocks, e.g.:
         // [buffer size]: [get pos]
-        // 1: 0   /   2: 0   /   3: 1   /   4: 1   /   5: 2 ...
+        // 1: 0   /   2: 0   /   3: 1   /   4: 1   /   5: 2 ...)
-        iMiddleOfBuffer =
+        iNewFillLevel =
             ( ( ( iMemSize - iBlockSize) / 2 ) / iBlockSize ) * iBlockSize;
+
+// TEST random init position
+if ( bUseRandomInit )
+{
+    const int iNumBlocks = iMemSize / iBlockSize;
+    if ( iNumBlocks < iNumBlocksBoundForRandom ) // just for very small buffers
+    {
+        // overwrite fill level with random value
+        iNewFillLevel = static_cast<int> ( static_cast<double> ( rand() ) *
+            iNumBlocks / RAND_MAX ) * iBlockSize;
+    }
+}
+
     }
 
     // different behaviour for get and put corrections
     if ( eClearType == CT_GET )
     {
-        // clear buffer
+        // clear buffer since we had a buffer underrun
         vecbyMemory.Reset ( 0 );
 
-        // correct buffer so that after the current get operation the pointer
+        // reset buffer pointers so that they are at maximum distance
-        // are at maximum distance
         iPutPos = 0;
-        iGetPos = iMiddleOfBuffer;
+        iGetPos = iNewFillLevel;
 
         // The buffer was cleared, the next time blocks are read from the
         // buffer, these are invalid ones. Calculate the number of invalid
         // elements
-        iNumInvalidElements = iMemSize - iMiddleOfBuffer;
+        iNumInvalidElements = iMemSize - iNewFillLevel;
 
         // check for special case
         if ( iPutPos == iGetPos )
@@ -274,7 +290,7 @@ void CNetBuf::Clear ( const EClearType eClearType )
     {
         // in case of "put" correction, do not delete old data but only shift
         // the pointers
-        iPutPos = iMiddleOfBuffer;
+        iPutPos = iNewFillLevel;
 
         // adjust put pointer relative to current get pointer, take care of
         // wrap around

src/channel.cpp

@@ -160,7 +160,7 @@ void CChannel::SetNetwFrameSizeAndFact ( const int iNewNetwFrameSize,
 
 bool CChannel::SetSockBufNumFrames ( const int iNewNumFrames )
 {
-    QMutexLocker locker ( &Mutex ); // this opperation must be done with mutex
+    QMutexLocker locker ( &Mutex ); // this operation must be done with mutex
 
     // first check for valid input parameter range
     if ( ( iNewNumFrames >= MIN_NET_BUF_SIZE_NUM_BL ) &&

src/server.h

@@ -117,7 +117,7 @@ protected:
     CVector<int16_t> ProcessData ( CVector<CVector<int16_t> >& vecvecsData,
                                    CVector<double>& vecdGains );
 
-    virtual void    customEvent ( QEvent* Event );
+    virtual void     customEvent ( QEvent* Event );
 
     // do not use the vector class since CChannel does not have appropriate
     // copy constructor/operator