fix for mutex in channel object

linux/sound.h

@@ -36,7 +36,7 @@
 
 // the number of periods is critical for latency
 #define NUM_PERIOD_BLOCKS_IN        2
-#define NUM_PERIOD_BLOCKS_OUT       2
+#define NUM_PERIOD_BLOCKS_OUT       1
 
 #define MAX_SND_BUF_IN              200
 #define MAX_SND_BUF_OUT             200

src/channel.cpp

@@ -914,7 +914,6 @@ void CChannel::OnNetTranspPropsReceived ( CNetworkTransportProps NetworkTranspor
     QMutexLocker locker ( &Mutex );
 
 // TEST
-// TODO use mutex in Put function
 // TODO check possiblity of received parameter -> error checking
 // utilize, e.g., MAX_MONO_AUD_BUFF_SIZE_AT_48KHZ
 vecNetwBufferInProps[0].iAudioBlockSize = NetworkTransportProps.iMonoAudioBlockSize;
@@ -955,6 +954,12 @@ EPutDataStat CChannel::PutData ( const CVector<unsigned char>& vecbyData,
     bool bIsProtocolPacket = false;
     bool bIsAudioPacket    = false;
     bool bNewConnection    = false;
+    bool bReinitializeIn   = false;
+    bool bReinitializeOut  = false;
+
+    // intermediate storage for new parameters
+    int           iNewAudioBlockSize;
+    EAudComprType eNewAudComprType;
 
     if ( bIsEnabled )
     {
@@ -973,6 +978,8 @@ EPutDataStat CChannel::PutData ( const CVector<unsigned char>& vecbyData,
 
         // only try to parse audio if it was not a protocol packet
         if ( !bIsProtocolPacket )
+        {
+            Mutex.lock();
             {
                 // check if this is an audio packet by checking all possible lengths
                 const int iPossNetwSizes = vecNetwBufferInProps.Size();
@@ -985,31 +992,48 @@ EPutDataStat CChannel::PutData ( const CVector<unsigned char>& vecbyData,
                         bIsAudioPacket = true;
 
                         // check if we are correctly initialized
-                    const int iNewAudioBlockSize =
+                        iNewAudioBlockSize =
                             vecNetwBufferInProps[i].iAudioBlockSize;
 
-                    const EAudComprType eNewAudComprType =
+                        eNewAudComprType =
                             vecNetwBufferInProps[i].eAudComprType;
 
                         if ( ( iNewAudioBlockSize != iCurAudioBlockSizeIn ) ||
                              ( eNewAudComprType != AudioCompressionIn.GetType() ) )
                         {
-                        // re-initialize to new value
+                            bReinitializeIn = true;
-                        SetAudioBlockSizeAndComprIn (
-                            iNewAudioBlockSize, eNewAudComprType );
                         }
 
                         // in case of a server channel, use the same audio
                         // compression for output as for the input
                         if ( bIsServer )
                         {
-                        if ( GetAudioCompressionOut() != vecNetwBufferInProps[i].eAudComprType )
+                            if ( GetAudioCompressionOut() != eNewAudComprType )
                             {
-                            SetAudioCompressionOut ( vecNetwBufferInProps[i].eAudComprType );
+                                bReinitializeOut = true;
                             }
                         }
                     }
                 }
+                Mutex.unlock();
+
+                // actual initialization calls have to be made
+                // outside the mutex region since they internally
+                // use the same mutex, too                
+                if ( bReinitializeIn )
+                {
+                    // re-initialize to new value
+                    SetAudioBlockSizeAndComprIn (
+                        iNewAudioBlockSize, eNewAudComprType );
+
+                }
+                
+                if ( bReinitializeOut )
+                {
+                    SetAudioCompressionOut ( eNewAudComprType );
+
+                }
+            }
 
             Mutex.lock();
             {

src/client.cpp

@@ -161,7 +161,7 @@ void CClient::Start()
     // init object
 
 // TEST
-Init ( 192 );
+Init ( 256 );
 
     // enable channel
     Channel.SetEnable ( true );