Merge branch 'blipWork'

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,25 @@ 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! %d %d",offset,lastCount);
+    }
+
+    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) {
       bbInMapped[i]=NULL;
@@ -160,6 +192,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++) {
@@ -167,24 +201,54 @@ 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++) {
+  // I know, code duplication, but optimization...
-      if (bbIn[i]==NULL) continue;
+  if (rateMul) {
-      if (bb[i]==NULL) continue;
+    if (lowQuality) {
-      for (size_t j=0; j<runtotal; j++) {
+      for (int i=0; i<outs; i++) {
-        temp[i]=bbIn[i][j];
+        if (bbIn[i]==NULL) continue;
-        blip_add_delta_fast(bb[i],j,temp[i]-prevSample[i]);
+        if (bb[i]==NULL) continue;
-        prevSample[i]=temp[i];
+        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 {
-    for (int i=0; i<outs; i++) {
+    if (lowQuality) {
-      if (bbIn[i]==NULL) continue;
+      for (int i=0; i<outs; i++) {
-      if (bb[i]==NULL) continue;
+        if (bbIn[i]==NULL) continue;
-      for (size_t j=0; j<runtotal; j++) {
+        if (bb[i]==NULL) continue;
-        temp[i]=bbIn[i][j];
+        for (size_t j=0; j<runtotal; j++) {
-        blip_add_delta(bb[i],j,temp[i]-prevSample[i]);
+          temp[i]=bbIn[i][j];
-        prevSample[i]=temp[i];
+          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];
+        }
       }
     }
   }
@@ -209,6 +273,10 @@ void DivDispatchContainer::clear() {
     prevSample[i]=0;
   }
 
+  runPosSub=0;
+  fillSub=0;
+  lastCount=0;
+
   if (dispatch->getDCOffRequired()) {
     dcOffCompensation=true;
   }

src/engine/engine.h

@@ -184,12 +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, fillSub;
   double rateMemory;
 
   void setRates(double gotRate);
@@ -208,8 +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));