jamulussoftware · corrados · Aug 20, 2020 · Sep 26, 2020 · Sep 26, 2020 · Sep 26, 2020
diff --git a/ChangeLog b/ChangeLog
@@ -21,6 +21,9 @@
 - bug fix: reduced server list is displayed instead of the normal list (#657)
 
 
+TODO BUG FIX: the new Windows audio interface gives ugly clipping (which the old one does not)!!!
+
+TODO switched all remaining audio sample processing to use floats, coded by hselasky (#544)
 
 
 

diff --git a/android/sound.cpp b/android/sound.cpp
@@ -27,7 +27,7 @@
 
 /* Implementation *************************************************************/
 
-CSound::CSound ( void           (*fpNewProcessCallback) ( CVector<short>& psData, void* arg ),
+CSound::CSound ( void           (*fpNewProcessCallback) ( CVector<float>& pfData, void* arg ),
                  void*          arg,
                  const int      iCtrlMIDIChannel,
                  const bool     ,

diff --git a/android/sound.h b/android/sound.h
@@ -34,7 +34,7 @@
 class CSound : public CSoundBase, public oboe::AudioStreamCallback
 {
 public:
-    CSound ( void           (*fpNewProcessCallback) ( CVector<short>& psData, void* arg ),
+    CSound ( void           (*fpNewProcessCallback) ( CVector<float>& pfData, void* arg ),
              void*          arg,
              const int      iCtrlMIDIChannel,
              const bool     ,

diff --git a/libs/oboe b/libs/oboe
diff --git a/linux/sound.cpp b/linux/sound.cpp
@@ -228,7 +228,7 @@ int CSound::Init ( const int /* iNewPrefMonoBufferSize */ )
     iJACKBufferSizeStero = 2 * iJACKBufferSizeMono;
 
     // create memory for intermediate audio buffer
-    vecsTmpAudioSndCrdStereo.Init ( iJACKBufferSizeStero );
+    vecfTmpAudioSndCrdStereo.Init ( iJACKBufferSizeStero );
 
     return iJACKBufferSizeMono;
 }
@@ -259,16 +259,13 @@ int CSound::process ( jack_nframes_t nframes, void* arg )
         {
             for ( i = 0; i < pSound->iJACKBufferSizeMono; i++ )
             {
-                pSound->vecsTmpAudioSndCrdStereo[2 * i] =
-                    (short) ( in_left[i] * _MAXSHORT );
-
-                pSound->vecsTmpAudioSndCrdStereo[2 * i + 1] =
-                    (short) ( in_right[i] * _MAXSHORT );
+                pSound->vecfTmpAudioSndCrdStereo[2 * i]     = in_left[i];
+                pSound->vecfTmpAudioSndCrdStereo[2 * i + 1] = in_right[i];
             }
         }
 
         // call processing callback function
-        pSound->ProcessCallback ( pSound->vecsTmpAudioSndCrdStereo );
+        pSound->ProcessCallback ( pSound->vecfTmpAudioSndCrdStereo );
 
         // get output data pointer
         jack_default_audio_sample_t* out_left =
@@ -285,10 +282,10 @@ int CSound::process ( jack_nframes_t nframes, void* arg )
             for ( i = 0; i < pSound->iJACKBufferSizeMono; i++ )
             {
                 out_left[i] = (jack_default_audio_sample_t)
-                    pSound->vecsTmpAudioSndCrdStereo[2 * i] / _MAXSHORT;
+                    pSound->vecfTmpAudioSndCrdStereo[2 * i];
 
                 out_right[i] = (jack_default_audio_sample_t)
-                    pSound->vecsTmpAudioSndCrdStereo[2 * i + 1] / _MAXSHORT;
+                    pSound->vecfTmpAudioSndCrdStereo[2 * i + 1];
             }
         }
     }

diff --git a/linux/sound.h b/linux/sound.h
@@ -60,7 +60,7 @@
 class CSound : public CSoundBase
 {
 public:
-    CSound ( void           (*fpNewProcessCallback) ( CVector<short>& psData, void* arg ),
+    CSound ( void           (*fpNewProcessCallback) ( CVector<float>& pfData, void* arg ),
              void*          arg,
              const int      iCtrlMIDIChannel,
              const bool     bNoAutoJackConnect,
@@ -78,7 +78,7 @@ class CSound : public CSoundBase
 
     // these variables should be protected but cannot since we want
     // to access them from the callback function
-    CVector<short> vecsTmpAudioSndCrdStereo;
+    CVector<float> vecfTmpAudioSndCrdStereo;
     int            iJACKBufferSizeMono;
     int            iJACKBufferSizeStero;
     bool           bJackWasShutDown;
@@ -111,7 +111,7 @@ class CSound : public CSoundBase
     Q_OBJECT
 
 public:
-    CSound ( void           (*fpNewProcessCallback) ( CVector<short>& psData, void* pParg ),
+    CSound ( void           (*fpNewProcessCallback) ( CVector<float>& pfData, void* pParg ),
              void*          pParg,
              const int      iCtrlMIDIChannel,
              const bool     ,
@@ -122,12 +122,12 @@ class CSound : public CSoundBase
                                                          this, &CSound::OnTimer ); }
     virtual ~CSound() {}
     virtual int Init ( const int iNewPrefMonoBufferSize ) { CSoundBase::Init ( iNewPrefMonoBufferSize );
-                                                            vecsTemp.Init ( 2 * iNewPrefMonoBufferSize );
+                                                            vecfTemp.Init ( 2 * iNewPrefMonoBufferSize );
                                                             return iNewPrefMonoBufferSize; }
     CHighPrecisionTimer HighPrecisionTimer;
-    CVector<short>      vecsTemp;
+    CVector<float>      vecfTemp;
 
 public slots:
-    void OnTimer() { vecsTemp.Reset ( 0 ); if ( IsRunning() ) { ProcessCallback ( vecsTemp ); } }
+    void OnTimer() { vecfTemp.Reset ( 0 ); if ( IsRunning() ) { ProcessCallback ( vecfTemp ); } }
 };
 #endif // WITH_SOUND
diff --git a/mac/sound.cpp b/mac/sound.cpp
@@ -26,7 +26,7 @@
 
 
 /* Implementation *************************************************************/
-CSound::CSound ( void           (*fpNewProcessCallback) ( CVector<short>& psData, void* arg ),
+CSound::CSound ( void           (*fpNewProcessCallback) ( CVector<float>& pfData, void* arg ),
                  void*          arg,
                  const int      iCtrlMIDIChannel,
                  const bool     ,
@@ -848,7 +848,7 @@ int CSound::Init ( const int iNewPrefMonoBufferSize )
     iCoreAudioBufferSizeStereo = 2 * iCoreAudioBufferSizeMono;
 
     // create memory for intermediate audio buffer
-    vecsTmpAudioSndCrdStereo.Init ( iCoreAudioBufferSizeStereo );
+    vecfTmpAudioSndCrdStereo.Init ( iCoreAudioBufferSizeStereo );
 
     return iCoreAudioBufferSizeMono;
 }
@@ -970,8 +970,8 @@ OSStatus CSound::callbackIO ( AudioDeviceID          inDevice,
             for ( int i = 0; i < iCoreAudioBufferSizeMono; i++ )
             {
                 // copy left and right channels separately
-                pSound->vecsTmpAudioSndCrdStereo[2 * i]     = (short) ( pLeftData[iNumChanPerFrameLeft * i + iSelInInterlChLeft] * _MAXSHORT );
-                pSound->vecsTmpAudioSndCrdStereo[2 * i + 1] = (short) ( pRightData[iNumChanPerFrameRight * i + iSelInInterlChRight] * _MAXSHORT );
+                pSound->vecfTmpAudioSndCrdStereo[2 * i]     = pLeftData[iNumChanPerFrameLeft * i + iSelInInterlChLeft];
+                pSound->vecfTmpAudioSndCrdStereo[2 * i + 1] = pRightData[iNumChanPerFrameRight * i + iSelInInterlChRight];
             }
 
             // add an additional optional channel
@@ -982,8 +982,8 @@ OSStatus CSound::callbackIO ( AudioDeviceID          inDevice,
 
                 for ( int i = 0; i < iCoreAudioBufferSizeMono; i++ )
                 {
-                    pSound->vecsTmpAudioSndCrdStereo[2 * i] = Float2Short (
-                        pSound->vecsTmpAudioSndCrdStereo[2 * i] + pLeftData[iNumChanPerFrameLeft * i + iSelAddInInterlChLeft] * _MAXSHORT );
+                    pSound->vecfTmpAudioSndCrdStereo[2 * i] = ClipFloat (
+                        pSound->vecfTmpAudioSndCrdStereo[2 * i] + pLeftData[iNumChanPerFrameLeft * i + iSelAddInInterlChLeft] );
                 }
             }
 
@@ -994,19 +994,19 @@ OSStatus CSound::callbackIO ( AudioDeviceID          inDevice,
 
                 for ( int i = 0; i < iCoreAudioBufferSizeMono; i++ )
                 {
-                    pSound->vecsTmpAudioSndCrdStereo[2 * i + 1] = Float2Short (
-                        pSound->vecsTmpAudioSndCrdStereo[2 * i + 1] + pRightData[iNumChanPerFrameRight * i + iSelAddInInterlChRight] * _MAXSHORT );
+                    pSound->vecfTmpAudioSndCrdStereo[2 * i + 1] = ClipFloat (
+                        pSound->vecfTmpAudioSndCrdStereo[2 * i + 1] + pRightData[iNumChanPerFrameRight * i + iSelAddInInterlChRight] );
                 }
             }
         }
         else
         {
             // incompatible sizes, clear work buffer
-            pSound->vecsTmpAudioSndCrdStereo.Reset ( 0 );
+            pSound->vecfTmpAudioSndCrdStereo.Reset ( 0 );
         }
 
         // call processing callback function
-        pSound->ProcessCallback ( pSound->vecsTmpAudioSndCrdStereo );
+        pSound->ProcessCallback ( pSound->vecfTmpAudioSndCrdStereo );
     }
 
     if ( ( inDevice == pSound->CurrentAudioOutputDeviceID ) && outOutputData )
@@ -1028,8 +1028,8 @@ OSStatus CSound::callbackIO ( AudioDeviceID          inDevice,
            for ( int i = 0; i < iCoreAudioBufferSizeMono; i++ )
            {
                // copy left and right channels separately
-               pLeftData[iNumChanPerFrameLeft * i + iSelOutInterlChLeft]    = (Float32) pSound->vecsTmpAudioSndCrdStereo[2 * i] / _MAXSHORT;
-               pRightData[iNumChanPerFrameRight * i + iSelOutInterlChRight] = (Float32) pSound->vecsTmpAudioSndCrdStereo[2 * i + 1] / _MAXSHORT;
+               pLeftData[iNumChanPerFrameLeft * i + iSelOutInterlChLeft]    = (Float32) pSound->vecfTmpAudioSndCrdStereo[2 * i];
+               pRightData[iNumChanPerFrameRight * i + iSelOutInterlChRight] = (Float32) pSound->vecfTmpAudioSndCrdStereo[2 * i + 1];
            }
         }
     }

diff --git a/mac/sound.h b/mac/sound.h
@@ -36,7 +36,7 @@
 class CSound : public CSoundBase
 {
 public:
-    CSound ( void           (*fpNewProcessCallback) ( CVector<short>& psData, void* arg ),
+    CSound ( void           (*fpNewProcessCallback) ( CVector<float>& pfData, void* arg ),
              void*          arg,
              const int      iCtrlMIDIChannel,
              const bool     ,
@@ -63,7 +63,7 @@ class CSound : public CSoundBase
 
     // these variables should be protected but cannot since we want
     // to access them from the callback function
-    CVector<short> vecsTmpAudioSndCrdStereo;
+    CVector<float> vecfTmpAudioSndCrdStereo;
     int            iCoreAudioBufferSizeMono;
     int            iCoreAudioBufferSizeStereo;
     AudioDeviceID  CurrentAudioInputDeviceID;

diff --git a/src/buffer.h b/src/buffer.h
@@ -500,16 +500,16 @@ template<class TData> class CConvBuf
         }
     }
 
-    void PutAll ( const CVector<TData>& vecsData )
+    void PutAll ( const CVector<TData>& vecData )
     {
         iGetPos = 0;
 
-        std::copy ( vecsData.begin(),
-                    vecsData.begin() + iBufferSize, // note that input vector might be larger then memory size
+        std::copy ( vecData.begin(),
+                    vecData.begin() + iBufferSize, // note that input vector might be larger then memory size
                     vecMemory.begin() );
     }
 
-    bool Put ( const CVector<TData>& vecsData,
+    bool Put ( const CVector<TData>& vecData,
                const int             iVecSize )
     {
         // calculate the input size and the end position after copying
@@ -519,8 +519,8 @@ template<class TData> class CConvBuf
         if ( iEnd <= iBufferSize )
         {
             // copy new data in internal buffer
-            std::copy ( vecsData.begin(),
-                        vecsData.begin() + iVecSize,
+            std::copy ( vecData.begin(),
+                        vecData.begin() + iVecSize,
                         vecMemory.begin() + iPutPos );
 
             // set buffer pointer one block further
@@ -540,18 +540,18 @@ template<class TData> class CConvBuf
         return vecMemory;
     }
 
-    void GetAll ( CVector<TData>& vecsData,
+    void GetAll ( CVector<TData>& vecData,
                   const int       iVecSize )
     {
         iPutPos = 0;
 
         // copy data from internal buffer in given buffer
         std::copy ( vecMemory.begin(),
                     vecMemory.begin() + iVecSize,
-                    vecsData.begin() );
+                    vecData.begin() );
     }
 
-    bool Get ( CVector<TData>& vecsData,
+    bool Get ( CVector<TData>& vecData,
                const int       iVecSize )
     {
         // calculate the input size and the end position after copying
@@ -563,7 +563,7 @@ template<class TData> class CConvBuf
             // copy new data from internal buffer
             std::copy ( vecMemory.begin() + iGetPos,
                         vecMemory.begin() + iGetPos + iVecSize,
-                        vecsData.begin() );
+                        vecData.begin() );
 
             // set buffer pointer one block further
             iGetPos = iEnd;

diff --git a/src/channel.cpp b/src/channel.cpp
@@ -36,7 +36,7 @@ CChannel::CChannel ( const bool bNIsServer ) :
     bIsEnabled             ( false ),
     bIsServer              ( bNIsServer ),
     iAudioFrameSizeSamples ( DOUBLE_SYSTEM_FRAME_SIZE_SAMPLES ),
-    SignalLevelMeter       ( false, 0.5 ) // server mode with mono out and faster smoothing
+    SignalLevelMeter       ( false, 0.5f ) // server mode with mono out and faster smoothing
 {
     // reset network transport properties
     ResetNetworkTransportProperties();
@@ -675,12 +675,12 @@ void CChannel::PrepAndSendPacket ( CHighPrioSocket*        pSocket,
     }
 }
 
-double CChannel::UpdateAndGetLevelForMeterdB ( const CVector<short>& vecsAudio,
-                                               const int             iInSize,
-                                               const bool            bIsStereoIn )
+float CChannel::UpdateAndGetLevelForMeterdB ( const CVector<float>& vecfAudio,
+                                              const int             iInSize,
+                                              const bool            bIsStereoIn )
 {
     // update the signal level meter and immediately return the current value
-    SignalLevelMeter.Update ( vecsAudio,
+    SignalLevelMeter.Update ( vecfAudio,
                               iInSize,
                               bIsStereoIn );
 

diff --git a/src/channel.h b/src/channel.h
@@ -176,9 +176,9 @@ void CreateReqChannelLevelListMes() { Protocol.CreateReqChannelLevelListMes(); }
 
     CNetworkTransportProps GetNetworkTransportPropsFromCurrentSettings();
 
-    double UpdateAndGetLevelForMeterdB ( const CVector<short>& vecsAudio,
-                                         const int             iInSize,
-                                         const bool            bIsStereoIn );
+    float UpdateAndGetLevelForMeterdB ( const CVector<float>& vecfAudio,
+                                        const int             iInSize,
+                                        const bool            bIsStereoIn );
 
 protected:
     bool ProtocolIsEnabled();
Original file line number	Diff line number	Diff line change
Expand Up		@@ -21,6 +21,9 @@
		- bug fix: reduced server list is displayed instead of the normal list (#657)


		TODO BUG FIX: the new Windows audio interface gives ugly clipping (which the old one does not)!!!

		TODO switched all remaining audio sample processing to use floats, coded by hselasky (#544)



Expand Down