From 73204b5378dc161255cc5b35b6369548f8885b08 Mon Sep 17 00:00:00 2001
From: tildearrow <me@tildearrow.org>
Date: Sun, 16 Apr 2023 01:11:20 -0500
Subject: [PATCH 1/4] blip_buf clock<rate bug workaround, part 2?

---
 src/engine/dispatchContainer.cpp | 31 +++++++++++++++++++++++++------
 src/engine/engine.h              |  3 +++
 2 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/src/engine/dispatchContainer.cpp b/src/engine/dispatchContainer.cpp
index c30d7f231..307f09574 100644
--- a/src/engine/dispatchContainer.cpp
+++ b/src/engine/dispatchContainer.cpp
@@ -86,9 +86,16 @@
 void DivDispatchContainer::setRates(double gotRate) {
   int outs=dispatch->getOutputCount();
 
+  int rate=dispatch->rate;
+  rateMul=0;
+  while (rateMul<8 && rate<gotRate) {
+    rate*=2;
+    rateMul++;
+  }
+
   for (int i=0; i<outs; i++) {
     if (bb[i]==NULL) continue;
-    blip_set_rates(bb[i],dispatch->rate,gotRate);
+    blip_set_rates(bb[i],rate,gotRate);
   }
   rateMemory=gotRate;
 }
@@ -120,7 +127,13 @@ void DivDispatchContainer::grow(size_t size) {
         logE("not enough memory!"); \
         return; \
       } \
-      blip_set_rates(bb[i],dispatch->rate,rateMemory); \
+      int rate=dispatch->rate; \
+      rateMul=0; \
+      while (rateMul<8 && rate<rateMemory) { \
+        rate*=2; \
+        rateMul++; \
+      } \
+      blip_set_rates(bb[i],rate,rateMemory); \
  \
       if (bbIn[i]==NULL) bbIn[i]=new short[bbInLen]; \
       if (bbOut[i]==NULL) bbOut[i]=new short[bbInLen]; \
@@ -134,6 +147,8 @@ void DivDispatchContainer::grow(size_t size) {
 void DivDispatchContainer::acquire(size_t offset, size_t count) {
   CHECK_MISSING_BUFS;
 
+  
+
   for (int i=0; i<DIV_MAX_OUTPUTS; i++) {
     if (i>=outs) {
       bbInMapped[i]=NULL;
@@ -160,6 +175,8 @@ void DivDispatchContainer::flush(size_t count) {
 void DivDispatchContainer::fillBuf(size_t runtotal, size_t offset, size_t size) {
   CHECK_MISSING_BUFS;
 
+  int step=1<<rateMul;
+
   if (dcOffCompensation && runtotal>0) {
     dcOffCompensation=false;
     for (int i=0; i<outs; i++) {
@@ -171,8 +188,9 @@ void DivDispatchContainer::fillBuf(size_t runtotal, size_t offset, size_t size)
     for (int i=0; i<outs; i++) {
       if (bbIn[i]==NULL) continue;
       if (bb[i]==NULL) continue;
-      for (size_t j=0; j<runtotal; j++) {
-        temp[i]=bbIn[i][j];
+      int s=0;
+      for (size_t j=0; j<runtotal; j+=step) {
+        temp[i]=bbIn[i][s++];
         blip_add_delta_fast(bb[i],j,temp[i]-prevSample[i]);
         prevSample[i]=temp[i];
       }
@@ -181,8 +199,9 @@ void DivDispatchContainer::fillBuf(size_t runtotal, size_t offset, size_t size)
     for (int i=0; i<outs; i++) {
       if (bbIn[i]==NULL) continue;
       if (bb[i]==NULL) continue;
-      for (size_t j=0; j<runtotal; j++) {
-        temp[i]=bbIn[i][j];
+      int s=0;
+      for (size_t j=0; j<runtotal; j+=step) {
+        temp[i]=bbIn[i][s++];
         blip_add_delta(bb[i],j,temp[i]-prevSample[i]);
         prevSample[i]=temp[i];
       }
diff --git a/src/engine/engine.h b/src/engine/engine.h
index d31de903e..098090890 100644
--- a/src/engine/engine.h
+++ b/src/engine/engine.h
@@ -190,6 +190,7 @@ struct DivDispatchContainer {
   short* bbIn[DIV_MAX_OUTPUTS];
   short* bbOut[DIV_MAX_OUTPUTS];
   bool lowQuality, dcOffCompensation;
+  unsigned char rateMul, runPosSub;
   double rateMemory;
 
   void setRates(double gotRate);
@@ -210,6 +211,8 @@ struct DivDispatchContainer {
     lastAvail(0),
     lowQuality(false),
     dcOffCompensation(false),
+    rateMul(0),
+    runPosSub(0),
     rateMemory(0.0) {
     memset(bb,0,DIV_MAX_OUTPUTS*sizeof(blip_buffer_t*));
     memset(temp,0,DIV_MAX_OUTPUTS*sizeof(int));

From a10d5cb96bfc0d105ebadcc1018a39827bba0cde Mon Sep 17 00:00:00 2001
From: tildearrow <me@tildearrow.org>
Date: Sun, 16 Apr 2023 14:41:12 -0500
Subject: [PATCH 2/4] blip_buf clock<rate bug workaround, part 3

issue #1055
---
 src/engine/dispatchContainer.cpp | 31 ++++++++++++++++++++++++++++---
 src/engine/engine.h              |  6 ++++--
 2 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/src/engine/dispatchContainer.cpp b/src/engine/dispatchContainer.cpp
index 307f09574..d98c450e0 100644
--- a/src/engine/dispatchContainer.cpp
+++ b/src/engine/dispatchContainer.cpp
@@ -147,7 +147,24 @@ void DivDispatchContainer::grow(size_t size) {
 void DivDispatchContainer::acquire(size_t offset, size_t count) {
   CHECK_MISSING_BUFS;
 
-  
+  if (rateMul) {
+    //logV("req: from %d to %d",offset,offset+count-1);
+    offset+=runPosSub;
+    size_t oldCount=count;
+    runPosSub=(runPosSub+oldCount)&((1<<rateMul)-1);
+    count+=runPosSub;
+
+    offset>>=rateMul;
+    count>>=rateMul;
+
+    if (offset!=0 && offset!=lastCount) {
+      logW("Shit!");
+    }
+
+    lastCount=offset+count;
+
+    logV("got: from %d to %d",offset,offset+count-1);
+  }
 
   for (int i=0; i<DIV_MAX_OUTPUTS; i++) {
     if (i>=outs) {
@@ -189,7 +206,7 @@ void DivDispatchContainer::fillBuf(size_t runtotal, size_t offset, size_t size)
       if (bbIn[i]==NULL) continue;
       if (bb[i]==NULL) continue;
       int s=0;
-      for (size_t j=0; j<runtotal; j+=step) {
+      for (size_t j=fillSub; j<runtotal; j+=step) {
         temp[i]=bbIn[i][s++];
         blip_add_delta_fast(bb[i],j,temp[i]-prevSample[i]);
         prevSample[i]=temp[i];
@@ -200,7 +217,7 @@ void DivDispatchContainer::fillBuf(size_t runtotal, size_t offset, size_t size)
       if (bbIn[i]==NULL) continue;
       if (bb[i]==NULL) continue;
       int s=0;
-      for (size_t j=0; j<runtotal; j+=step) {
+      for (size_t j=fillSub; j<runtotal; j+=step) {
         temp[i]=bbIn[i][s++];
         blip_add_delta(bb[i],j,temp[i]-prevSample[i]);
         prevSample[i]=temp[i];
@@ -208,6 +225,10 @@ void DivDispatchContainer::fillBuf(size_t runtotal, size_t offset, size_t size)
     }
   }
 
+  if (rateMul) {
+    fillSub=(fillSub+runtotal)&((1<<rateMul)-1);
+  }
+
   for (int i=0; i<outs; i++) {
     if (bbOut[i]==NULL) continue;
     if (bb[i]==NULL) continue;
@@ -228,6 +249,10 @@ void DivDispatchContainer::clear() {
     prevSample[i]=0;
   }
 
+  runPosSub=0;
+  fillSub=0;
+  lastCount=0;
+
   if (dispatch->getDCOffRequired()) {
     dcOffCompensation=true;
   }
diff --git a/src/engine/engine.h b/src/engine/engine.h
index 098090890..077daf5dc 100644
--- a/src/engine/engine.h
+++ b/src/engine/engine.h
@@ -184,13 +184,13 @@ struct DivNoteEvent {
 struct DivDispatchContainer {
   DivDispatch* dispatch;
   blip_buffer_t* bb[DIV_MAX_OUTPUTS];
-  size_t bbInLen, runtotal, runLeft, runPos, lastAvail;
+  size_t bbInLen, runtotal, runLeft, runPos, lastAvail, lastCount;
   int temp[DIV_MAX_OUTPUTS], prevSample[DIV_MAX_OUTPUTS];
   short* bbInMapped[DIV_MAX_OUTPUTS];
   short* bbIn[DIV_MAX_OUTPUTS];
   short* bbOut[DIV_MAX_OUTPUTS];
   bool lowQuality, dcOffCompensation;
-  unsigned char rateMul, runPosSub;
+  unsigned char rateMul, runPosSub, fillSub;
   double rateMemory;
 
   void setRates(double gotRate);
@@ -209,10 +209,12 @@ struct DivDispatchContainer {
     runLeft(0),
     runPos(0),
     lastAvail(0),
+    lastCount(0),
     lowQuality(false),
     dcOffCompensation(false),
     rateMul(0),
     runPosSub(0),
+    fillSub(0),
     rateMemory(0.0) {
     memset(bb,0,DIV_MAX_OUTPUTS*sizeof(blip_buffer_t*));
     memset(temp,0,DIV_MAX_OUTPUTS*sizeof(int));

From 670c681a716e972e290cb154187559ece3497c10 Mon Sep 17 00:00:00 2001
From: tildearrow <me@tildearrow.org>
Date: Sun, 16 Apr 2023 14:45:05 -0500
Subject: [PATCH 3/4] remove debug messages

---
 src/engine/dispatchContainer.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/engine/dispatchContainer.cpp b/src/engine/dispatchContainer.cpp
index d98c450e0..44b58b402 100644
--- a/src/engine/dispatchContainer.cpp
+++ b/src/engine/dispatchContainer.cpp
@@ -158,12 +158,12 @@ void DivDispatchContainer::acquire(size_t offset, size_t count) {
     count>>=rateMul;
 
     if (offset!=0 && offset!=lastCount) {
-      logW("Shit!");
+      logW("Shit! %d %d",offset,lastCount);
     }
 
     lastCount=offset+count;
 
-    logV("got: from %d to %d",offset,offset+count-1);
+    //logV("got: from %d to %d",offset,offset+count-1);
   }
 
   for (int i=0; i<DIV_MAX_OUTPUTS; i++) {

From ef7e16baaac9dc04dedbea2f9043eddf4326b383 Mon Sep 17 00:00:00 2001
From: tildearrow <me@tildearrow.org>
Date: Sun, 16 Apr 2023 14:50:53 -0500
Subject: [PATCH 4/4] opti

---
 src/engine/dispatchContainer.cpp | 70 +++++++++++++++++++++-----------
 1 file changed, 47 insertions(+), 23 deletions(-)

diff --git a/src/engine/dispatchContainer.cpp b/src/engine/dispatchContainer.cpp
index 44b58b402..b73aea2fd 100644
--- a/src/engine/dispatchContainer.cpp
+++ b/src/engine/dispatchContainer.cpp
@@ -201,32 +201,56 @@ void DivDispatchContainer::fillBuf(size_t runtotal, size_t offset, size_t size)
       prevSample[i]=bbIn[i][0];
     }
   }
-  if (lowQuality) {
-    for (int i=0; i<outs; i++) {
-      if (bbIn[i]==NULL) continue;
-      if (bb[i]==NULL) continue;
-      int s=0;
-      for (size_t j=fillSub; j<runtotal; j+=step) {
-        temp[i]=bbIn[i][s++];
-        blip_add_delta_fast(bb[i],j,temp[i]-prevSample[i]);
-        prevSample[i]=temp[i];
-      }
-    }
-  } else {
-    for (int i=0; i<outs; i++) {
-      if (bbIn[i]==NULL) continue;
-      if (bb[i]==NULL) continue;
-      int s=0;
-      for (size_t j=fillSub; j<runtotal; j+=step) {
-        temp[i]=bbIn[i][s++];
-        blip_add_delta(bb[i],j,temp[i]-prevSample[i]);
-        prevSample[i]=temp[i];
-      }
-    }
-  }
 
+  // I know, code duplication, but optimization...
   if (rateMul) {
+    if (lowQuality) {
+      for (int i=0; i<outs; i++) {
+        if (bbIn[i]==NULL) continue;
+        if (bb[i]==NULL) continue;
+        int s=0;
+        for (size_t j=fillSub; j<runtotal; j+=step) {
+          temp[i]=bbIn[i][s++];
+          blip_add_delta_fast(bb[i],j,temp[i]-prevSample[i]);
+          prevSample[i]=temp[i];
+        }
+      }
+    } else {
+      for (int i=0; i<outs; i++) {
+        if (bbIn[i]==NULL) continue;
+        if (bb[i]==NULL) continue;
+        int s=0;
+        for (size_t j=fillSub; j<runtotal; j+=step) {
+          temp[i]=bbIn[i][s++];
+          blip_add_delta(bb[i],j,temp[i]-prevSample[i]);
+          prevSample[i]=temp[i];
+        }
+      }
+    }
+
     fillSub=(fillSub+runtotal)&((1<<rateMul)-1);
+  } else {
+    if (lowQuality) {
+      for (int i=0; i<outs; i++) {
+        if (bbIn[i]==NULL) continue;
+        if (bb[i]==NULL) continue;
+        for (size_t j=0; j<runtotal; j++) {
+          temp[i]=bbIn[i][j];
+          blip_add_delta_fast(bb[i],j,temp[i]-prevSample[i]);
+          prevSample[i]=temp[i];
+        }
+      }
+    } else {
+      for (int i=0; i<outs; i++) {
+        if (bbIn[i]==NULL) continue;
+        if (bb[i]==NULL) continue;
+        for (size_t j=0; j<runtotal; j++) {
+          temp[i]=bbIn[i][j];
+          blip_add_delta(bb[i],j,temp[i]-prevSample[i]);
+          prevSample[i]=temp[i];
+        }
+      }
+    }
   }
 
   for (int i=0; i<outs; i++) {