some initial work on server timer problem

src/channel.cpp

@@ -136,7 +136,7 @@ void CChannel::SetNetwFrameSizeAndFact ( const int iNewNetwFrameSize,
     ConvBuf.Init ( iNetwFrameSize * iNetwFrameSizeFact );
 
     // initialize and reset cycle time variance measurement
-    CycleTimeVariance.Init ( iNetwFrameSizeFact * SYSTEM_BLOCK_SIZE_SAMPLES,
+    CycleTimeVariance.Init ( iNetwFrameSizeFact * SYSTEM_BLOCK_FRAME_SAMPLES,
         SYSTEM_SAMPLE_RATE, TIME_MOV_AV_RESPONSE );
 
     CycleTimeVariance.Reset();
@@ -157,7 +157,7 @@ bool CChannel::SetSockBufSize ( const int iNumBlocks )
 
         // the network block size is a multiple of the internal minimal
         // block size
-        SockBuf.Init ( SYSTEM_BLOCK_SIZE_SAMPLES, iNumBlocks );
+        SockBuf.Init ( SYSTEM_BLOCK_FRAME_SAMPLES, iNumBlocks );
 
         return false; // -> no error
     }
@@ -432,12 +432,12 @@ EGetDataStat CChannel::GetData ( CVector<uint8_t>& vecbyData )
         // subtract the number of samples of the current block since the
         // time out counter is based on samples not on blocks (definition:
         // always one atomic block is get by using the GetData() function
-        // where the atomic block size is "SYSTEM_BLOCK_SIZE_SAMPLES")
+        // where the atomic block size is "SYSTEM_BLOCK_FRAME_SAMPLES")
 
 // TODO this code only works with the above assumption -> better
 //      implementation so that we are not depending on assumptions
 
-        iConTimeOut -= SYSTEM_BLOCK_SIZE_SAMPLES;
+        iConTimeOut -= SYSTEM_BLOCK_FRAME_SAMPLES;
 
         if ( iConTimeOut <= 0 )
         {
@@ -490,7 +490,7 @@ CVector<uint8_t> CChannel::PrepSendPacket ( const CVector<uint8_t>& vecbyNPacket
 
 int CChannel::GetUploadRateKbps()
 {
-    const int iAudioSizeOut = iNetwFrameSizeFact * SYSTEM_BLOCK_SIZE_SAMPLES;
+    const int iAudioSizeOut = iNetwFrameSizeFact * SYSTEM_BLOCK_FRAME_SAMPLES;
 
     // we assume that the UDP packet which is transported via IP has an
     // additional header size of

src/global.h

@@ -60,10 +60,10 @@
 
 // System block size, this is the block size on which the audio coder works.
 // All other block sizes must be a multiple of this size
-#define SYSTEM_BLOCK_SIZE_SAMPLES       128
+#define SYSTEM_BLOCK_FRAME_SAMPLES      128
 
 #define SYSTEM_BLOCK_DURATION_MS_FLOAT  \
-    ( static_cast<double> ( SYSTEM_BLOCK_SIZE_SAMPLES ) / \
+    ( static_cast<double> ( SYSTEM_BLOCK_FRAME_SAMPLES ) / \
     SYSTEM_SAMPLE_RATE * 1000 )
 
 // define the maximum mono audio buffer size at a sample rate

src/server.cpp

@@ -50,15 +50,34 @@ CServer::CServer ( const QString& strLoggingFileName,
     vstrChatColors[4] = "maroon";
     vstrChatColors[5] = "coral";
 
-    vecsSendData.Init ( SYSTEM_BLOCK_SIZE_SAMPLES );
+    vecsSendData.Init ( SYSTEM_BLOCK_FRAME_SAMPLES );
 
     // init moving average buffer for response time evaluation
-    CycleTimeVariance.Init ( SYSTEM_BLOCK_SIZE_SAMPLES,
+    CycleTimeVariance.Init ( SYSTEM_BLOCK_FRAME_SAMPLES,
         SYSTEM_SAMPLE_RATE, TIME_MOV_AV_RESPONSE );
 
+
     // connect timer timeout signal
-    QObject::connect ( &Timer, SIGNAL ( timeout() ),
+    QObject::connect ( &HighPrecisionTimer, SIGNAL ( timeout() ),
-        this, SLOT ( OnTimer() ) );
+        this, SLOT ( OnHighPrecisionTimer() ) );
+
+
+
+/*
+// init timer stuff
+//vTimeOutIntervals = [0 ]
+
+// for 128 sample frame size at 48 kHz sampling rate:
+// actual intervals:  0.0  2.666  5.333  8.0
+// quantized to 1 ms: 0    3      5      8 (0)
+
+// for 256 sample frame size at 48 kHz sampling rate:
+// actual intervals:  0.0  5.333  10.666  16.0
+// quantized to 1 ms: 0    5      11      16 (0)
+*/
+
+
+
 
     // enable logging (if requested)
     if ( !strLoggingFileName.isEmpty() )
@@ -176,10 +195,8 @@ void CServer::Start()
 {
     if ( !IsRunning() )
     {
-        // start main timer
+        // start main timer with lowest possible resolution
-
+        HighPrecisionTimer.start ( MIN_TIMER_RESOLUTION_MS );
-// TEST
-Timer.start ( static_cast<int> ( ceil ( SYSTEM_BLOCK_DURATION_MS_FLOAT ) ) );
 
         // init time for response time evaluation
         CycleTimeVariance.Reset();
@@ -189,16 +206,22 @@ Timer.start ( static_cast<int> ( ceil ( SYSTEM_BLOCK_DURATION_MS_FLOAT ) ) );
 void CServer::Stop()
 {
     // stop main timer
-    Timer.stop();
+    HighPrecisionTimer.stop();
 
     // logging
     Logging.AddServerStopped();
 }
 
+void CServer::OnHighPrecisionTimer()
+{
+    // TEST
+    OnTimer();
+}
+
 void CServer::OnTimer()
 {
     CVector<int>              vecChanID;
-    CVector<CVector<double> > vecvecdData ( SYSTEM_BLOCK_SIZE_SAMPLES );
+    CVector<CVector<double> > vecvecdData ( SYSTEM_BLOCK_FRAME_SAMPLES );
     CVector<CVector<double> > vecvecdGains;
 
     // get data from all connected clients
@@ -240,7 +263,7 @@ void CServer::GetBlockAllConC ( CVector<int>&              vecChanID,
     bool bChannelIsNowDisconnected = false;
 
     // init temporal data vector and clear input buffers
-    CVector<double> vecdData ( SYSTEM_BLOCK_SIZE_SAMPLES );
+    CVector<double> vecdData ( SYSTEM_BLOCK_FRAME_SAMPLES );
 
     vecChanID.Init    ( 0 );
     vecvecdData.Init  ( 0 );
@@ -668,7 +691,7 @@ CVector<short> CServer::ProcessData ( CVector<CVector<double> >& vecvecdData,
     int i;
 
     // init return vector with zeros since we mix all channels on that vector
-    CVector<short> vecsOutData ( SYSTEM_BLOCK_SIZE_SAMPLES, 0 );
+    CVector<short> vecsOutData ( SYSTEM_BLOCK_FRAME_SAMPLES, 0 );
 
     const int iNumClients = vecvecdData.Size();
 
@@ -678,7 +701,7 @@ CVector<short> CServer::ProcessData ( CVector<CVector<double> >& vecvecdData,
         // if channel gain is 1, avoid multiplication for speed optimization
         if ( vecdGains[j] == static_cast<double> ( 1.0 ) )
         {
-            for ( i = 0; i < SYSTEM_BLOCK_SIZE_SAMPLES; i++ )
+            for ( i = 0; i < SYSTEM_BLOCK_FRAME_SAMPLES; i++ )
             {
                 vecsOutData[i] =
                     Double2Short ( vecsOutData[i] + vecvecdData[j][i] );
@@ -686,7 +709,7 @@ CVector<short> CServer::ProcessData ( CVector<CVector<double> >& vecvecdData,
         }
         else
         {
-            for ( i = 0; i < SYSTEM_BLOCK_SIZE_SAMPLES; i++ )
+            for ( i = 0; i < SYSTEM_BLOCK_FRAME_SAMPLES; i++ )
             {
                 vecsOutData[i] =
                     Double2Short ( vecsOutData[i] +

src/server.h

@@ -29,6 +29,7 @@
 #include <qtimer.h>
 #include <qdatetime.h>
 #include <qhostaddress.h>
+#include "celt.h"
 #include "global.h"
 #include "socket.h"
 #include "channel.h"
@@ -40,6 +41,18 @@
 // no valid channel number
 #define INVALID_CHANNEL_ID                  ( MAX_NUM_CHANNELS + 1 )
 
+// minimum timer precision
+#define MIN_TIMER_RESOLUTION_MS             1 // ms
+
+// add some error checking, the high precision timer implementation only
+// supports 128 and 256 samples frame size at 48 kHz sampling rate
+#if ( ( SYSTEM_BLOCK_FRAME_SAMPLES != 128 ) && ( SYSTEM_BLOCK_FRAME_SAMPLES != 256 ) )
+# error "Only system frame sizes of 128 and 256 samples are supported by this module"
+#endif
+#if SYSTEM_SAMPLE_RATE != 48000
+# error "Only a system sample rate of 48 kHz is supported by this module"
+#endif
+
 
 /* Classes ********************************************************************/
 class CServer : public QObject
@@ -56,7 +69,7 @@ public:
 
     void Start();
     void Stop();
-    bool IsRunning() { return Timer.isActive(); }
+    bool IsRunning() { return HighPrecisionTimer.isActive(); }
 
     bool GetTimingStdDev ( double& dCurTiStdDev );
 
@@ -100,12 +113,20 @@ protected:
                                   CVector<double>& vecdGains );
 
     virtual void    customEvent ( QEvent* Event );
+    void            OnTimer();
 
     /* do not use the vector class since CChannel does not have appropriate
        copy constructor/operator */
     CChannel            vecChannels[MAX_NUM_CHANNELS];
     QMutex              Mutex;
 
+    // audio encoder/decoder
+    CELTMode*               CeltMode[MAX_NUM_CHANNELS];
+    CELTEncoder*            CeltEncoder[MAX_NUM_CHANNELS];
+    CELTDecoder*            CeltDecoder[MAX_NUM_CHANNELS];
+    int                     iCeltNumCodedBytes[MAX_NUM_CHANNELS];
+    CVector<unsigned char>  vecCeltData[MAX_NUM_CHANNELS];
+
     CVector<QString>    vstrChatColors;
 
     // HTML file server status
@@ -113,7 +134,7 @@ protected:
     QString             strServerHTMLFileListName;
     QString             strServerNameWithPort;
 
-    QTimer              Timer;
+    QTimer              HighPrecisionTimer;
     CVector<short>      vecsSendData;
 
     // actual working objects
@@ -125,7 +146,7 @@ protected:
     CServerLogging      Logging;
 
 public slots:
-    void OnTimer();
+    void OnHighPrecisionTimer();
     void OnSendProtMessage ( int iChID, CVector<uint8_t> vecMessage );
 
     // CODE TAG: MAX_NUM_CHANNELS_TAG