Add RAW_SUPPORTED protocol message and refactor client and server code

softins · ann0see · commit bad1367a2128 · 2026-05-20T20:21:11.000+02:00
diff --git a/src/channel.cpp b/src/channel.cpp
@@ -83,6 +83,8 @@ CChannel::CChannel ( const bool bNIsServer ) :
 
     QObject::connect ( &Protocol, &CProtocol::ClientIDReceived, this, &CChannel::ClientIDReceived );
 
+    QObject::connect ( &Protocol, &CProtocol::RawAudioSupported, this, &CChannel::RawAudioSupported );
+
     QObject::connect ( &Protocol, &CProtocol::MuteStateHasChangedReceived, this, &CChannel::MuteStateHasChangedReceived );
 
     QObject::connect ( &Protocol, &CProtocol::ChangeChanInfo, this, &CChannel::OnChangeChanInfo );
diff --git a/src/channel.h b/src/channel.h
@@ -149,6 +149,7 @@ class CChannel : public QObject
         }
     }
     void CreateClientIDMes ( const int iChanID ) { Protocol.CreateClientIDMes ( iChanID ); }
+    void CreateRawAudioSupportedMes() { Protocol.CreateRawAudioSupportedMes(); }
     void CreateReqNetwTranspPropsMes() { Protocol.CreateReqNetwTranspPropsMes(); }
     void CreateReqSplitMessSupportMes() { Protocol.CreateReqSplitMessSupportMes(); }
     void CreateReqJitBufMes() { Protocol.CreateReqJitBufMes(); }
@@ -272,6 +273,7 @@ public slots:
     void ConClientListMesReceived ( CVector<CChannelInfo> vecChanInfo );
     void ChanInfoHasChanged();
     void ClientIDReceived ( int iChanID );
+    void RawAudioSupported();
     void MuteStateHasChanged ( int iChanID, bool bIsMuted );
     void MuteStateHasChangedReceived ( int iChanID, bool bIsMuted );
     void ReqChanInfo();
diff --git a/src/client.cpp b/src/client.cpp
@@ -71,8 +71,7 @@ CClient::CClient ( const quint16  iPortNumber,
     bEnableIPv6 ( bNEnableIPv6 ),
     bMuteMeInPersonalMix ( bNMuteMeInPersonalMix ),
     iServerSockBufNumFrames ( DEF_NET_BUF_SIZE_NUM_BL ),
-    bRawAudioIsSupported ( false ),
-    bUseRawAudio ( false )
+    bRawAudioIsSupported ( false )
 {
     int iOpusError;
 
@@ -133,11 +132,13 @@ CClient::CClient ( const quint16  iPortNumber,
 
     QObject::connect ( &Channel, &CChannel::ClientIDReceived, this, &CClient::OnClientIDReceived );
 
+    QObject::connect ( &Channel, &CChannel::RawAudioSupported, this, &CClient::OnRawAudioSupported );
+
     QObject::connect ( &Channel, &CChannel::MuteStateHasChangedReceived, this, &CClient::OnMuteStateHasChangedReceived );
 
     QObject::connect ( &Channel, &CChannel::LicenceRequired, this, &CClient::LicenceRequired );
 
-    QObject::connect ( &Channel, &CChannel::VersionAndOSReceived, this, &CClient::OnVersionAndOSReceived );
+    QObject::connect ( &Channel, &CChannel::VersionAndOSReceived, this, &CClient::VersionAndOSReceived );
 
     QObject::connect ( &Channel, &CChannel::RecorderStateReceived, this, &CClient::RecorderStateReceived );
 
@@ -397,32 +398,6 @@ void CClient::OnConClientListMesReceived ( CVector<CChannelInfo> vecChanInfo )
     emit ConClientListMesReceived ( vecChanInfo );
 }
 
-void CClient::OnVersionAndOSReceived ( COSUtil::EOpSystemType eOSType, QString strVersion )
-{
-#if QT_VERSION >= QT_VERSION_CHECK( 5, 6, 0 )
-    const bool bWasRunning = Sound.IsRunning();
-    if ( bWasRunning )
-    {
-        Sound.Stop();
-    }
-    if ( QVersionNumber::compare ( QVersionNumber::fromString ( strVersion ), QVersionNumber ( 3, 11, 1 ) ) == 0 )
-    {
-        bRawAudioIsSupported = true;
-        Init();
-    }
-    else
-    {
-        bRawAudioIsSupported = false;
-        Init();
-    }
-    if ( bWasRunning )
-    {
-        Sound.Start();
-    }
-#endif
-    emit VersionAndOSReceived ( eOSType, strVersion );
-}
-
 void CClient::CreateServerJitterBufferMessage()
 {
     // per definition in the client: if auto jitter buffer is enabled, both,
@@ -1017,6 +992,27 @@ void CClient::OnClientIDReceived ( int iServerChanID )
     emit ClientIDReceived ( iChanID );
 }
 
+void CClient::OnRawAudioSupported()
+{
+    if ( !bRawAudioIsSupported )
+    {
+        const bool bWasRunning = Sound.IsRunning();
+
+        if ( bWasRunning )
+        {
+            Sound.Stop();
+        }
+
+        bRawAudioIsSupported = true;
+        Init();
+
+        if ( bWasRunning )
+        {
+            Sound.Start();
+        }
+    }
+}
+
 void CClient::Start()
 {
     // init object
@@ -1047,7 +1043,6 @@ void CClient::Stop()
 
     // Fall back to opus in case raw was used
     bRawAudioIsSupported = false;
-    bUseRawAudio         = false;
     Init();
 
     // wait for approx. 100 ms to make sure no audio packet is still in the
@@ -1190,12 +1185,17 @@ void CClient::Init()
                 iCeltNumCodedBytes = OPUS_NUM_BYTES_MONO_HIGH_QUALITY_DBLE_FRAMESIZE;
                 break;
             case AQ_RAW:
-                if ( bRawAudioIsSupported && Channel.IsEnabled() )
+                if ( bRawAudioIsSupported )
                 {
+                    // no OPUS encoding or decoding
+                    CurOpusEncoder = nullptr;
+                    CurOpusDecoder = nullptr;
+
                     iCeltNumCodedBytes = sizeof ( int16_t ) * iNumAudioChannels * iOPUSFrameSizeSamples;
                 }
                 else
                 {
+                    // fall back to highest OPUS quality
                     iCeltNumCodedBytes = OPUS_NUM_BYTES_MONO_HIGH_QUALITY_DBLE_FRAMESIZE;
                 }
                 break;
@@ -1219,12 +1219,17 @@ void CClient::Init()
                 iCeltNumCodedBytes = OPUS_NUM_BYTES_STEREO_HIGH_QUALITY_DBLE_FRAMESIZE;
                 break;
             case AQ_RAW:
-                if ( bRawAudioIsSupported && Channel.IsEnabled() )
+                if ( bRawAudioIsSupported )
                 {
+                    // no OPUS encoding or decoding
+                    CurOpusEncoder = nullptr;
+                    CurOpusDecoder = nullptr;
+
                     iCeltNumCodedBytes = sizeof ( int16_t ) * iNumAudioChannels * iOPUSFrameSizeSamples;
                 }
                 else
                 {
+                    // fall back to highest OPUS quality
                     iCeltNumCodedBytes = OPUS_NUM_BYTES_STEREO_HIGH_QUALITY_DBLE_FRAMESIZE;
                 }
                 break;
@@ -1253,12 +1258,17 @@ void CClient::Init()
                 iCeltNumCodedBytes = OPUS_NUM_BYTES_MONO_HIGH_QUALITY;
                 break;
             case AQ_RAW:
-                if ( bRawAudioIsSupported && Channel.IsEnabled() )
+                if ( bRawAudioIsSupported )
                 {
+                    // no OPUS encoding or decoding
+                    CurOpusEncoder = nullptr;
+                    CurOpusDecoder = nullptr;
+
                     iCeltNumCodedBytes = sizeof ( int16_t ) * iNumAudioChannels * iOPUSFrameSizeSamples;
                 }
                 else
                 {
+                    // fall back to highest OPUS quality
                     iCeltNumCodedBytes = OPUS_NUM_BYTES_MONO_HIGH_QUALITY;
                 }
                 break;
@@ -1282,22 +1292,24 @@ void CClient::Init()
                 iCeltNumCodedBytes = OPUS_NUM_BYTES_STEREO_HIGH_QUALITY;
                 break;
             case AQ_RAW:
-                if ( bRawAudioIsSupported && Channel.IsEnabled() )
+                if ( bRawAudioIsSupported )
                 {
+                    // no OPUS encoding or decoding
+                    CurOpusEncoder = nullptr;
+                    CurOpusDecoder = nullptr;
+
                     iCeltNumCodedBytes = sizeof ( int16_t ) * iNumAudioChannels * iOPUSFrameSizeSamples;
                 }
                 else
                 {
+                    // fall back to highest OPUS quality
                     iCeltNumCodedBytes = OPUS_NUM_BYTES_STEREO_HIGH_QUALITY;
                 }
                 break;
             }
         }
     }
 
-    // determine whether to use raw audio
-    bUseRawAudio = bRawAudioIsSupported && eAudioQuality == AQ_RAW;
-
     // calculate stereo (two channels) buffer size
     iStereoBlockSizeSam = 2 * iMonoBlockSizeSam;
 
@@ -1306,7 +1318,7 @@ void CClient::Init()
     vecsStereoSndCrdMuteStream.Init ( iStereoBlockSizeSam );
 
     // In case we are connected to a non raw audio server or we don't use raw audio we need to initialze the codec
-    if ( !bUseRawAudio )
+    if ( CurOpusEncoder != nullptr )
     {
         opus_custom_encoder_ctl ( CurOpusEncoder,
                                   OPUS_SET_BITRATE ( CalcBitRateBitsPerSecFromCodedBytes ( iCeltNumCodedBytes, iOPUSFrameSizeSamples ) ) );
@@ -1471,33 +1483,34 @@ void CClient::ProcessAudioDataIntern ( CVector<int16_t>& vecsStereoSndCrd )
 
     for ( i = 0, j = 0; i < iSndCrdFrameSizeFactor; i++, j += iNumAudioChannels * iOPUSFrameSizeSamples )
     {
-        if ( !bUseRawAudio )
+        // OPUS encoding or copying RAW audio?
+        if ( CurOpusEncoder != nullptr )
         {
             // OPUS encoding
-            if ( CurOpusEncoder != nullptr )
+            if ( bMuteOutStream )
             {
-                if ( bMuteOutStream )
-                {
-                    iUnused = opus_custom_encode ( CurOpusEncoder, &vecZeros[j], iOPUSFrameSizeSamples, &vecCeltData[0], iCeltNumCodedBytes );
-                }
-                else
-                {
-                    iUnused = opus_custom_encode ( CurOpusEncoder, &vecsStereoSndCrd[j], iOPUSFrameSizeSamples, &vecCeltData[0], iCeltNumCodedBytes );
-                }
+                iUnused = opus_custom_encode ( CurOpusEncoder, &vecZeros[j], iOPUSFrameSizeSamples, &vecCeltData[0], iCeltNumCodedBytes );
+            }
+            else
+            {
+                iUnused = opus_custom_encode ( CurOpusEncoder, &vecsStereoSndCrd[j], iOPUSFrameSizeSamples, &vecCeltData[0], iCeltNumCodedBytes );
             }
         }
-        else
+        else if ( bRawAudioIsSupported )
         {
+            // RAW audio
             if ( bMuteOutStream )
             {
+                // output muted - fill with silence
                 memset ( &vecCeltData[0], 0, iCeltNumCodedBytes );
             }
             else
             {
-                // Send raw samples instead of OPUS
+                // copy raw audio data
                 memcpy ( &vecCeltData[0], &vecsStereoSndCrd[j], iCeltNumCodedBytes );
             }
         }
+
         // send coded audio through the network
         Channel.PrepAndSendPacket ( &Socket, vecCeltData, iCeltNumCodedBytes );
     }
@@ -1517,38 +1530,40 @@ void CClient::ProcessAudioDataIntern ( CVector<int16_t>& vecsStereoSndCrd )
         // get pointer to coded data and manage the flags
         if ( bReceiveDataOk )
         {
-            if ( eAudioQuality == AQ_RAW && bRawAudioIsSupported )
-            {
-                memcpy ( &vecsStereoSndCrd[j], &vecbyNetwData[0], iCeltNumCodedBytes );
-                pCurCodedData = nullptr;
-            }
-            else
-            {
-                pCurCodedData = &vecbyNetwData[0];
-            }
+            pCurCodedData = &vecbyNetwData[0];
 
             // on any valid received packet, we clear the initialization phase flag
             bIsInitializationPhase = false;
         }
         else
         {
-            if ( eAudioQuality == AQ_RAW && bRawAudioIsSupported )
-            {
-                memset ( &vecsStereoSndCrd[j], 0, iCeltNumCodedBytes );
-            }
-
             // for lost packets use null pointer as coded input data
             pCurCodedData = nullptr;
 
             // invalidate the buffer OK status flag
             bJitterBufferOK = false;
         }
 
-        if ( !bUseRawAudio && CurOpusDecoder != nullptr )
+        // OPUS decoding or copying RAW audio?
+        if ( CurOpusDecoder != nullptr )
         {
             // OPUS decoding
             iUnused = opus_custom_decode ( CurOpusDecoder, pCurCodedData, iCeltNumCodedBytes, &vecsStereoSndCrd[j], iOPUSFrameSizeSamples );
         }
+        else if ( bRawAudioIsSupported )
+        {
+            // RAW audio
+            if ( pCurCodedData != nullptr )
+            {
+                // copy raw audio data
+                memcpy ( &vecsStereoSndCrd[j], pCurCodedData, iCeltNumCodedBytes );
+            }
+            else
+            {
+                // missing audio - fill with silence
+                memset ( &vecsStereoSndCrd[j], 0, iCeltNumCodedBytes );
+            }
+        }
     }
 
     // for muted stream we have to add our local data here
@@ -1626,7 +1641,7 @@ int CClient::EstimatedOverallDelay ( const int iPingTimeMs )
     const float fDelayToFillNetworkPacketsMs = GetSystemMonoBlSize() * 1000.0f / SYSTEM_SAMPLE_RATE_HZ;
 
     // OPUS additional delay at small frame sizes is half a frame size
-    const float fAdditionalAudioCodecDelayMs = ( eAudioQuality == AQ_RAW && bRawAudioIsSupported ) ? 0.0f : fSystemBlockDurationMs / 2;
+    const float fAdditionalAudioCodecDelayMs = CurOpusDecoder != nullptr ? fSystemBlockDurationMs / 2 : 0.0f;
 
     const float fTotalBufferDelayMs =
         fDelayToFillNetworkPacketsMs + fTotalJitterBufferDelayMs + fTotalSoundCardDelayMs + fAdditionalAudioCodecDelayMs;
diff --git a/src/client.h b/src/client.h
@@ -368,7 +368,6 @@ class CClient : public QObject
     bool                   bMuteOutStream;
     float                  fMuteOutStreamGain;
     CVector<unsigned char> vecCeltData;
-    bool                   bUseRawAudio;
 
     CHighPrioSocket         Socket;
     CSound                  Sound;
@@ -455,10 +454,10 @@ protected slots:
     void OnControllerInFaderIsMute ( int iChannelIdx, bool bIsMute );
     void OnControllerInMuteMyself ( bool bMute );
     void OnClientIDReceived ( int iServerChanID );
+    void OnRawAudioSupported();
     void OnMuteStateHasChangedReceived ( int iServerChanID, bool bIsMuted );
     void OnCLChannelLevelListReceived ( CHostAddress InetAddr, CVector<uint16_t> vecLevelList );
     void OnConClientListMesReceived ( CVector<CChannelInfo> vecChanInfo );
-    void OnVersionAndOSReceived ( COSUtil::EOpSystemType eOSType, QString strVersion );
 
 signals:
     void ConClientListMesReceived ( CVector<CChannelInfo> vecChanInfo );
diff --git a/src/protocol.cpp b/src/protocol.cpp
@@ -235,6 +235,11 @@ MESSAGES (with connection)
     note: does not have any data -> n = 0
 
 
+- PROTMESSID_RAWAUDIO_SUPPORTED: informs client that server supports raw (uncompressed) audio
+
+    note: does not have any data -> n = 0
+
+
 - PROTMESSID_RECORDER_STATE: notifies of changes in the server jam recorder state
 
     +--------------+
@@ -813,6 +818,10 @@ void CProtocol::ParseMessageBody ( const CVector<uint8_t>& vecbyMesBodyData, con
                     EvaluateSplitMessSupportedMes();
                     break;
 
+                case PROTMESSID_RAWAUDIO_SUPPORTED:
+                    EvaluateRawAudioSupportedMes();
+                    break;
+
                 case PROTMESSID_LICENCE_REQUIRED:
                     EvaluateLicenceRequiredMes ( vecbyMesBodyDataRef );
                     break;
@@ -1520,6 +1529,16 @@ bool CProtocol::EvaluateSplitMessSupportedMes()
     return false; // no error
 }
 
+void CProtocol::CreateRawAudioSupportedMes() { CreateAndSendMessage ( PROTMESSID_RAWAUDIO_SUPPORTED, CVector<uint8_t> ( 0 ) ); }
+
+bool CProtocol::EvaluateRawAudioSupportedMes()
+{
+    // invoke message action
+    emit RawAudioSupported();
+
+    return false; // no error
+}
+
 void CProtocol::CreateLicenceRequiredMes ( const ELicenceType eLicenceType )
 {
     CVector<uint8_t> vecData ( 1 ); // 1 bytes of data
diff --git a/src/protocol.h b/src/protocol.h
diff --git a/src/server.cpp b/src/server.cpp
