Address more review comments and improve spacing

Author: softins

src/server.cpp

@@ -846,6 +846,7 @@ static CTimingMeas JitterMeas ( 1000, "test2.dat" ); JitterMeas.Measure(); // TE
         // prepare and decode connected channels
         if ( !bUseMT )
         {
+            // run the OPUS decoder for all data blocks
             DecodeReceiveDataBlocks ( this, 0, iNumClients - 1, iNumClients );
         }
         else
@@ -977,6 +978,8 @@ static CTimingMeas JitterMeas ( 1000, "test2.dat" ); JitterMeas.Measure(); // TE
     }
 }
 
+// This is a static method used as a callback, and does not inherit a "this" pointer,
+// so it is necessary for the server instance to be passed as a parameter.
 void CServer::DecodeReceiveDataBlocks ( CServer*  pServer,
                                         const int iStartChanCnt,
                                         const int iStopChanCnt,
@@ -989,6 +992,8 @@ void CServer::DecodeReceiveDataBlocks ( CServer*  pServer,
     }
 }
 
+// This is a static method used as a callback, and does not inherit a "this" pointer,
+// so it is necessary for the server instance to be passed as a parameter.
 void CServer::MixEncodeTransmitDataBlocks ( CServer*  pServer,
                                             const int iStartChanCnt,
                                             const int iStopChanCnt,
@@ -1101,7 +1106,7 @@ void CServer::DecodeReceiveData ( const int iChanCnt,
         // get current number of OPUS coded bytes
         const int iCeltNumCodedBytes = vecChannels[iCurChanID].GetCeltNumCodedBytes();
 
-        for ( int iB = 0; iB < vecNumFrameSizeConvBlocks[iChanCnt]; iB++ )
+        for ( size_t iB = 0; iB < (size_t)vecNumFrameSizeConvBlocks[iChanCnt]; iB++ )
         {
             // get data
             const EGetDataStat eGetStat = vecChannels[iCurChanID].GetData ( vecvecbyCodedData[iChanCnt], iCeltNumCodedBytes );
@@ -1410,10 +1415,10 @@ void CServer::MixEncodeTransmitData ( const int iChanCnt,
 //      optimization it would be better to set it only if the network frame size is changed
 opus_custom_encoder_ctl ( pCurOpusEncoder, OPUS_SET_BITRATE ( CalcBitRateBitsPerSecFromCodedBytes ( iCeltNumCodedBytes, iClientFrameSizeSamples ) ) );
 
-            for ( int iB = 0; iB < vecNumFrameSizeConvBlocks[iChanCnt]; iB++ )
+            for ( size_t iB = 0; iB < (size_t)vecNumFrameSizeConvBlocks[iChanCnt]; iB++ )
             {
                 iUnused = opus_custom_encode ( pCurOpusEncoder,
-                                               &vecsSendData[(long)iB * SYSTEM_FRAME_SIZE_SAMPLES * vecNumAudioChannels[iChanCnt]],
+                                               &vecsSendData[iB * SYSTEM_FRAME_SIZE_SAMPLES * vecNumAudioChannels[iChanCnt]],
                                                iClientFrameSizeSamples,
                                                &vecvecbyCodedData[iChanCnt][0],
                                                iCeltNumCodedBytes );

src/threadpool.h

@@ -44,44 +44,47 @@ class CThreadPool
     auto enqueue(F&& f, Args&&... args)
         -> std::future<typename std::result_of<F(Args...)>::type>;
     ~CThreadPool();
+
 private:
     // need to keep track of threads so we can join them
-    std::vector< std::thread > workers;
+    std::vector< std::thread >          workers;
     // the task queue
     std::queue< std::function<void()> > tasks;
 
     // synchronization
-    std::mutex queue_mutex;
-    std::condition_variable condition;
-    bool stop;
+    std::mutex                          queue_mutex;
+    std::condition_variable             condition;
+    bool                                stop;
 };
 
 // the constructor just launches some amount of workers
 inline CThreadPool::CThreadPool(size_t threads)
     :   stop(false)
 {
-    for(size_t i = 0;i<threads;++i)
-        workers.emplace_back(
-            [this]
-            {
-                for(;;)
+    for ( size_t i = 0; i < threads; ++i ) {
+        workers.emplace_back ( [this] {
+                for (;;)
                 {
                     std::function<void()> task;
 
                     {
-                        std::unique_lock<std::mutex> lock(this->queue_mutex);
-                        this->condition.wait(lock,
-                            [this]{ return this->stop || !this->tasks.empty(); });
-                        if(this->stop && this->tasks.empty())
+                        std::unique_lock<std::mutex> lock ( this->queue_mutex );
+                        this->condition.wait ( lock,
+                            [this] { return this->stop || !this->tasks.empty(); } );
+
+                        if ( this->stop && this->tasks.empty() ) {
                             return;
-                        task = std::move(this->tasks.front());
+                        }
+
+                        task = std::move ( this->tasks.front() );
                         this->tasks.pop();
                     }
 
                     task();
                 }
             }
         );
+    }
 }
 
 // add new work item to the pool
@@ -91,19 +94,19 @@ auto CThreadPool::enqueue(F&& f, Args&&... args)
 {
     using return_type = typename std::result_of<F(Args...)>::type;
 
-    auto task = std::make_shared< std::packaged_task<return_type()> >(
+    auto task = std::make_shared< std::packaged_task<return_type()> > (
             std::bind(std::forward<F>(f), std::forward<Args>(args)...)
         );
 
     std::future<return_type> res = task->get_future();
     {
-        std::unique_lock<std::mutex> lock(queue_mutex);
+        std::unique_lock<std::mutex> lock ( queue_mutex );
 
         // don't allow enqueueing after stopping the pool
-        if(stop)
-            throw std::runtime_error("enqueue on stopped CThreadPool");
+        if ( stop )
+            throw std::runtime_error( "enqueue on stopped CThreadPool" );
 
-        tasks.emplace([task](){ (*task)(); });
+        tasks.emplace ( [task] () { (*task)(); } );
     }
     condition.notify_one();
     return res;
@@ -113,11 +116,11 @@ auto CThreadPool::enqueue(F&& f, Args&&... args)
 inline CThreadPool::~CThreadPool()
 {
     {
-        std::unique_lock<std::mutex> lock(queue_mutex);
+        std::unique_lock<std::mutex> lock ( queue_mutex );
         stop = true;
     }
     condition.notify_all();
-    for(std::thread &worker: workers)
+    for ( std::thread &worker: workers )
         worker.join();
 }