fix zita process() loop

musescore · Mar 29, 2016 · e9c7791 · e9c7791
1 parent e4703f7
commit e9c7791
Show file tree

Hide file tree

Showing 2 changed files with 71 additions and 55 deletions.
diff --git a/effects/zita1/zita.cpp b/effects/zita1/zita.cpp
@@ -361,6 +361,9 @@ void ZitaReverb::init(float fsamp)
       _pareq2.setfsamp(fsamp);
       _pareq1.setparam(160.0, 0.0);
       _pareq2.setparam(2.5e3, 0.0);
+
+      _fragm = 1024;
+      _nsamp = 0;
       }
 
 
@@ -420,65 +423,75 @@ void ZitaReverb::prepare (int nfram)
 
 void ZitaReverb::process (int nfram, float* inp, float* out)
       {
-      prepare(2048);
-
       float t, g, x0, x1, x2, x3, x4, x5, x6, x7;
       g = sqrtf (0.125f);
 
-      float* p0 = inp;
-      float* p1 = inp + 1;
-      float* q0 = out;
-      float* q1 = out + 1;
-
-      for (int i = 0; i < nfram * 2; i += 2) {
-            _vdelay0.write (p0 [i]);
-            _vdelay1.write (p1 [i]);
-
-            t = 0.3f * _vdelay0.read ();
-            x0 = _diff1 [0].process (_delay [0].read () + t);
-            x1 = _diff1 [1].process (_delay [1].read () + t);
-            x2 = _diff1 [2].process (_delay [2].read () - t);
-            x3 = _diff1 [3].process (_delay [3].read () - t);
-            t = 0.3f * _vdelay1.read ();
-            x4 = _diff1 [4].process (_delay [4].read () + t);
-            x5 = _diff1 [5].process (_delay [5].read () + t);
-            x6 = _diff1 [6].process (_delay [6].read () - t);
-            x7 = _diff1 [7].process (_delay [7].read () - t);
-
-            t = x0 - x1; x0 += x1;  x1 = t;
-            t = x2 - x3; x2 += x3;  x3 = t;
-            t = x4 - x5; x4 += x5;  x5 = t;
-            t = x6 - x7; x6 += x7;  x7 = t;
-            t = x0 - x2; x0 += x2;  x2 = t;
-            t = x1 - x3; x1 += x3;  x3 = t;
-            t = x4 - x6; x4 += x6;  x6 = t;
-            t = x5 - x7; x5 += x7;  x7 = t;
-            t = x0 - x4; x0 += x4;  x4 = t;
-            t = x1 - x5; x1 += x5;  x5 = t;
-            t = x2 - x6; x2 += x6;  x6 = t;
-            t = x3 - x7; x3 += x7;  x7 = t;
-
-            _g1 += _d1;
-
-            q0 [i] = _g1 * (x1 + x2);
-            q1 [i] = _g1 * (x1 - x2);
-
-            _delay [0].write (_filt1 [0].process (g * x0));
-            _delay [1].write (_filt1 [1].process (g * x1));
-            _delay [2].write (_filt1 [2].process (g * x2));
-            _delay [3].write (_filt1 [3].process (g * x3));
-            _delay [4].write (_filt1 [4].process (g * x4));
-            _delay [5].write (_filt1 [5].process (g * x5));
-            _delay [6].write (_filt1 [6].process (g * x6));
-            _delay [7].write (_filt1 [7].process (g * x7));
-            }
-      _pareq1.process (nfram, out);
-      _pareq2.process (nfram, out);
 
-      for (int i = 0; i < nfram; i++) {
-            *out++ += _g0 * *inp++;
-            *out++ += _g0 * *inp++;
-            _g0 += _d0;
+      while (nfram) {
+            if (!_nsamp) {
+                  prepare(_fragm);
+                  _nsamp = _fragm;
+                  }
+
+            int k = _nsamp < nfram ? _nsamp : nfram;
+
+            float* p0 = inp;
+            float* p1 = inp + 1;
+            float* q0 = out;
+            float* q1 = out + 1;
+
+            for (int i = 0; i < k * 2; i += 2) {
+                  _vdelay0.write (p0 [i]);
+                  _vdelay1.write (p1 [i]);
+
+                  t = 0.3f * _vdelay0.read ();
+                  x0 = _diff1 [0].process (_delay [0].read () + t);
+                  x1 = _diff1 [1].process (_delay [1].read () + t);
+                  x2 = _diff1 [2].process (_delay [2].read () - t);
+                  x3 = _diff1 [3].process (_delay [3].read () - t);
+                  t = 0.3f * _vdelay1.read ();
+                  x4 = _diff1 [4].process (_delay [4].read () + t);
+                  x5 = _diff1 [5].process (_delay [5].read () + t);
+                  x6 = _diff1 [6].process (_delay [6].read () - t);
+                  x7 = _diff1 [7].process (_delay [7].read () - t);
+
+                  t = x0 - x1; x0 += x1;  x1 = t;
+                  t = x2 - x3; x2 += x3;  x3 = t;
+                  t = x4 - x5; x4 += x5;  x5 = t;
+                  t = x6 - x7; x6 += x7;  x7 = t;
+                  t = x0 - x2; x0 += x2;  x2 = t;
+                  t = x1 - x3; x1 += x3;  x3 = t;
+                  t = x4 - x6; x4 += x6;  x6 = t;
+                  t = x5 - x7; x5 += x7;  x7 = t;
+                  t = x0 - x4; x0 += x4;  x4 = t;
+                  t = x1 - x5; x1 += x5;  x5 = t;
+                  t = x2 - x6; x2 += x6;  x6 = t;
+                  t = x3 - x7; x3 += x7;  x7 = t;
+
+                  _g1 += _d1;
+
+                  q0 [i] = _g1 * (x1 + x2);
+                  q1 [i] = _g1 * (x1 - x2);
+
+                  _delay [0].write (_filt1 [0].process (g * x0));
+                  _delay [1].write (_filt1 [1].process (g * x1));
+                  _delay [2].write (_filt1 [2].process (g * x2));
+                  _delay [3].write (_filt1 [3].process (g * x3));
+                  _delay [4].write (_filt1 [4].process (g * x4));
+                  _delay [5].write (_filt1 [5].process (g * x5));
+                  _delay [6].write (_filt1 [6].process (g * x6));
+                  _delay [7].write (_filt1 [7].process (g * x7));
+                  }
+            _pareq1.process (k, out);
+            _pareq2.process (k, out);
+
+            for (int i = 0; i < k; i++) {
+                  *out++ += _g0 * *inp++;
+                  *out++ += _g0 * *inp++;
+                  _g0 += _d0;
+                  }
+            nfram  -= k;
+            _nsamp -= k;
             }
       }
 

diff --git a/effects/zita1/zita.h b/effects/zita1/zita.h
@@ -233,6 +233,9 @@ class ZitaReverb : public Effect
       static float _tdiff1 [8];
       static float _tdelay [8];
 
+      int _fragm;
+      int _nsamp;
+
       void prepare(int n);
 
    public: