fix #119446: calculate envelope for first point of new envelope right, fix divison by zero in amp increment calculation

Author: hpfmn

fluid/dsp.cpp

@@ -46,12 +46,12 @@ namespace FluidS {
  * - dsp_buf: Output buffer of floating point values (FLUID_BUFSIZE in length)
  */
 
-void updateAmpInc(unsigned int &nextNewAmpInc,std::map<int, struct VolEnvValSection>::iterator &curSample2AmpInc, qreal &dsp_amp_incr, unsigned int dsp_i)
+inline void updateAmpInc(unsigned int &nextNewAmpInc,std::map<int, qreal>::iterator &curSample2AmpInc, qreal &dsp_amp_incr, unsigned int dsp_i)
       {
       if (dsp_i >= nextNewAmpInc) {
             curSample2AmpInc++;
             nextNewAmpInc = curSample2AmpInc->first;
-            dsp_amp_incr = curSample2AmpInc->second.val;
+            dsp_amp_incr = curSample2AmpInc->second;
             }
       }
 
@@ -133,7 +133,7 @@ int Voice::dsp_float_interpolate_none(unsigned n)
       float *dsp_buf = voice->dsp_buf;
       float dsp_amp = voice->amp;
       auto curSample2AmpInc = Sample2AmpInc.begin();
-      qreal dsp_amp_incr = curSample2AmpInc->second.val;
+      qreal dsp_amp_incr = curSample2AmpInc->second;
       unsigned int nextNewAmpInc = curSample2AmpInc->first;
       unsigned int dsp_i = 0;
       unsigned int dsp_phase_index;
@@ -200,7 +200,7 @@ int Voice::dsp_float_interpolate_linear(unsigned n)
       float *dsp_buf = voice->dsp_buf;
       float dsp_amp = voice->amp;
       auto curSample2AmpInc = Sample2AmpInc.begin();
-      qreal dsp_amp_incr = curSample2AmpInc->second.val;
+      qreal dsp_amp_incr = curSample2AmpInc->second;
       unsigned int nextNewAmpInc = curSample2AmpInc->first;
       unsigned int dsp_i = 0;
       unsigned int dsp_phase_index;
@@ -293,7 +293,7 @@ int Voice::dsp_float_interpolate_4th_order(unsigned n)
       Phase dsp_phase_incr; // end_phase;
       short int* dsp_data = sample->data;
       auto curSample2AmpInc = Sample2AmpInc.begin();
-      qreal dsp_amp_incr = curSample2AmpInc->second.val;
+      qreal dsp_amp_incr = curSample2AmpInc->second;
       unsigned int nextNewAmpInc = curSample2AmpInc->first;
       unsigned int dsp_i  = 0;
       unsigned int dsp_phase_index;
@@ -439,7 +439,7 @@ int Voice::dsp_float_interpolate_7th_order(unsigned n)
       float *dsp_buf = voice->dsp_buf;
       float dsp_amp = voice->amp;
       auto curSample2AmpInc = Sample2AmpInc.begin();
-      qreal dsp_amp_incr = curSample2AmpInc->second.val;
+      qreal dsp_amp_incr = curSample2AmpInc->second;
       unsigned int nextNewAmpInc = curSample2AmpInc->first;
       unsigned int dsp_i = 0;
       unsigned int dsp_phase_index;

fluid/voice.cpp

@@ -220,7 +220,7 @@ float Voice::gen_get(int g)
       return gen[g].val;
       }
 
-void Voice::calcVolEnv(int n, fluid_env_data_t *env_data)
+inline void Voice::calcVolEnv(int n, fluid_env_data_t *env_data)
       {
       float x;
       /* calculate the envelope value and check for valid range */
@@ -273,7 +273,7 @@ void Voice::write(unsigned n, float* out, float* reverb, float* chorus)
 
       int restN = n;
 
-      if (volenv_section == FLUID_VOICE_ENVFINISHED) {
+      if (volenv_section >= FLUID_VOICE_ENVFINISHED) {
             off();
             return;
             }
@@ -294,7 +294,7 @@ void Voice::write(unsigned n, float* out, float* reverb, float* chorus)
             }
 
       sample2VolEnvSection.insert(std::pair<int, int>(n, volenv_section));
-      volumeChanges.insert(n-1);
+      volumeChanges.insert(n);
 
       fluid_check_fpe ("voice_write vol env");
 
@@ -388,7 +388,20 @@ void Voice::write(unsigned n, float* out, float* reverb, float* chorus)
             else
                   modlfo_val = 0;
 
-            if (curPos >= curVolEnvSection->first)
+            // never calculate anything for the very first sample
+            // everything should have been calculated in the last
+            // cycle - it would also cause a divion by zero later
+            if (curPos == 0) {
+                  curPos = 1;
+
+                  // if we should calulate for position 1 already make sure we don't do it twice
+                  // could lead to curPos==lastPos which causes devision by zero
+                  if (volumeChanges.find(1) != volumeChanges.end())
+                        volumeChanges.erase(volumeChanges.find(1));
+                  }
+
+            // just go to the next volume section if we're below last volume point
+            if (curPos >= curVolEnvSection->first && (unsigned int) curVolEnvSection->first < n)
                   curVolEnvSection++;
 
             volenv_count += curPos-lastPos;
@@ -462,7 +475,7 @@ void Voice::write(unsigned n, float* out, float* reverb, float* chorus)
             /* Volume increment to go from voice->amp to target_amp in FLUID_BUFSIZE steps */
             amp_incr = (target_amp - oldTargetAmp) / (curPos - lastPos);
             lastPos = curPos;
-            Sample2AmpInc.insert(std::pair<int, struct VolEnvValSection>(curPos, {amp_incr, volenv_section}));
+            Sample2AmpInc.insert(std::pair<int, qreal>(curPos, amp_incr));
             oldTargetAmp = target_amp;
             }
 

fluid/voice.h

@@ -57,11 +57,6 @@ enum fluid_voice_envelope_index_t {
 	FLUID_VOICE_ENVLAST
       };
 
-struct VolEnvValSection {
-      qreal val;
-      int volenv_section;
-      };
-
 //---------------------------------------------------------
 //   Voice
 //---------------------------------------------------------
@@ -121,7 +116,7 @@ class Voice
 	fluid_env_data_t volenv_data[FLUID_VOICE_ENVLAST];
 	unsigned int volenv_count;
 	int volenv_section;
-   std::map<int, struct VolEnvValSection> Sample2AmpInc;
+   std::map<int, qreal> Sample2AmpInc;
 	float volenv_val;
 	float amplitude_that_reaches_noise_floor_nonloop;
 	float amplitude_that_reaches_noise_floor_loop;