[#3757] Fix samplerate converter maximum samples

sflphone-common/src/audio/audiortp/AudioRtpSession.h

@@ -771,7 +771,6 @@ void AudioRtpSession<D>::run ()
     // Timestamp must be initialized randomly
     _timestamp = static_cast<D*> (this)->getCurrentTimestamp();
 
-    int sessionWaiting;
     int threadSleep = 0;
 
     if (_codecSampleRate != 0) {
@@ -812,8 +811,6 @@ void AudioRtpSession<D>::run ()
         // converterSamplingRate = _audiolayer->getMainBuffer()->getInternalSamplingRate();
         _converterSamplingRate = _manager->getAudioDriver()->getMainBuffer()->getInternalSamplingRate();
 
-        sessionWaiting = static_cast<D*> (this)->isWaiting();
-
         // Send session
         if (_eventQueue.size() > 0) {
             sendDtmfEvent (_eventQueue.front());
@@ -824,18 +821,6 @@ void AudioRtpSession<D>::run ()
         // Recv session
         receiveSpeakerData ();
 
-        /*
-
-            // Let's wait for the next transmit cycle
-            if (sessionWaiting == 1) {
-                // Record mic and speaker during conversation
-                _ca->recAudio.recData (_spkrDataDecoded, _micData, _nSamplesSpkr, _nSamplesMic);
-            } else {
-                // Record mic only while leaving a message
-                _ca->recAudio.recData (_micData,_nSamplesMic);
-            }
-        */
-
         _manager->getAudioLayerMutex()->leave();
 
         // Let's wait for the next transmit cycle

sflphone-common/src/audio/sound/audiofile.cpp

@@ -248,10 +248,6 @@ bool WaveFile::isFileOpened()
 bool WaveFile::openExistingWaveFile (const std::string& fileName, int audioSamplingRate)
 {
 
-    // Sample rate converter initialized with 88200 sample long
-    int converterSamples  = 88200;
-    SamplerateConverter _converter (converterSamples, 2000);
-
     _debug ("WaveFile: Opening %s", fileName.c_str());
 
     _file_stream.open (fileName.c_str(), std::ios::in | std::ios::binary);
@@ -359,6 +355,12 @@ bool WaveFile::openExistingWaveFile (const std::string& fileName, int audioSampl
     }
 
 
+    // Sample rate converter initialized with 88200 sample long
+    int converterSamples  = (srate > audioSamplingRate) ? srate : audioSamplingRate;
+    SamplerateConverter _converter (converterSamples, 2000);
+
+    int nbSampleMax = 512;
+
     // Get length of data from the header.
     SINT32 bytes;
     _file_stream.read ( (char*) &bytes, 4);
@@ -408,7 +410,7 @@ bool WaveFile::openExistingWaveFile (const std::string& fileName, int audioSampl
 
         while (remainingSamples > 0) {
 
-            int toProcess = remainingSamples > converterSamples ? converterSamples : remainingSamples;
+            int toProcess = remainingSamples > nbSampleMax ? nbSampleMax : remainingSamples;
             int nbSamplesConverted = 0;
 
             if (srate < audioSamplingRate) {