commit 107267b9a4761bc13faa37a8dfb3cc50c2c5d20e
parent dea5fe9666952d3596ef242df0231fbc7a1280b2
Author: fundamental <[email protected]>
Date: Wed, 23 Dec 2009 21:29:16 -0500
Echo: reworking delay resize
- Still some issues (crackles from improperly distribution workload)
Diffstat:
4 files changed, 111 insertions(+), 113 deletions(-)
diff --git a/src/Effects/Echo.cpp b/src/Effects/Echo.cpp
@@ -32,13 +32,11 @@ Echo::Echo(const int &insertion_,
:Effect(insertion_, efxoutl_, efxoutr_, NULL, 0),
Pvolume(50), Ppanning(64), //Pdelay(60),
Plrdelay(100), Plrcross(100), Pfb(40), Phidamp(60),
- dl(0), dr(0), lrdelay(0), delaySample(1), old(0.0),
- itr(0),
- maxDelay(SAMPLE_RATE * (1.5 + (pow(2.0, 9) - 1.0) /1000.0) + 1)
+ delayTime(1), dl(1), dr(1), lrdelay(0), delay(128000), old(0.0),
+ pos(0)
+
{
pthread_mutex_init(&mutex, NULL);
- delaySample.l() = Sample(maxDelay, 0.0);
- delaySample.r() = Sample(maxDelay, 0.0);
initdelays();
setpreset(Ppreset);
}
@@ -50,8 +48,8 @@ Echo::~Echo() {}
*/
void Echo::cleanup()
{
- delaySample.l().clear();
- delaySample.r().clear();
+ delay.l().clear();
+ delay.r().clear();
old = Stereo<REALTYPE>(0.0);
}
@@ -61,47 +59,35 @@ void Echo::cleanup()
*/
void Echo::initdelays()
{
+ int dl = (int)(delayCtl.getiVal() * SAMPLE_RATE - lrdelay);
+ if(dl < 1)
+ dl = 1;
+
+ int dr = (int)(delayCtl.getiVal() * SAMPLE_RATE + lrdelay);
+ if(dr < 1)
+ dr = 1;
+
+ if(dl == delay.l().size() && dr == delay.r().size())
+ return; //no need to do anything here
+
+ //resetting the loop to a known state
pthread_mutex_lock(&mutex);
- int ndl = (int)(delay.getiVal() * SAMPLE_RATE - lrdelay);
- if(ndl < 0)
- ndl = dl = 0;
-
- int ndr = (int)(delay.getiVal() * SAMPLE_RATE + lrdelay);
- if(ndr < 0)
- ndr = dr = 0;
-
- if(ndl != dl) { //lets rewite history
- Sample rewrite(ndl);
- int j = 0;
- //this is where real iterators would be useful
- for(int i=(itr>dl?itr-dl:itr+maxDelay-dl); i%maxDelay!=itr; ++i)
- rewrite[j++] = delaySample.l()[i];
- rewrite.resize(ndl);
- j = 0;
- for(int i=(itr>ndl?itr-ndl:itr+maxDelay-ndl); i%maxDelay!=itr; ++i)
- delaySample.l()[i] = rewrite[j++];
- }
-
- if(ndr != dr) { //lets rewite history
- Sample rewrite(ndr);
- int j = 0;
- //this is where real iterators would be useful
- for(int i=(itr>dr?itr-dr:itr+maxDelay-dr); i%maxDelay!=itr; ++i)
- rewrite[j++] = delaySample.r()[i];
- rewrite.resize(ndr);
- j = 0;
- for(int i=(itr>ndr?itr-ndr:itr+maxDelay-ndr); i%maxDelay!=itr; ++i)
- delaySample.r()[i] = rewrite[j++];
- }
- dl = ndl;
- dr = ndr;
-
-
- //cout << "dl: " << dl << endl;
- //cout << "dr: " << dr << endl;
- //cout << "max: " << maxDelay << endl;
+ Sample tmpl(delay.l().size());
+ for(int i = 0; i < delay.l().size(); ++i)
+ tmpl[i] = delay.l()[pos.l()+i];
+
+ Sample tmpr(delay.r().size());
+ for(int i = 0; i < delay.r().size(); ++i)
+ tmpr[i] = delay.r()[pos.r()+i];
+
+ tmpl.resize(dl);
+ tmpr.resize(dr);
+
+ delay.l() = tmpl;
+ delay.r() = tmpr;
+ pos.l() = 0;
+ pos.r() = 0;
pthread_mutex_unlock(&mutex);
-
}
void Echo::out(const Stereo<Sample> &input)
@@ -110,28 +96,46 @@ void Echo::out(const Stereo<Sample> &input)
pthread_mutex_lock(&mutex);
for(int i = 0; i < input.l().size(); ++i) {
- //get past samples (maxDelay is used due to implementaiton of Sample)
- dl;
- "foo";
- itr;
- ldl = delaySample.l()[itr-dl+maxDelay];
- rdl = delaySample.r()[itr-dr+maxDelay];
+ //get past samples (delay .size() is used due to implementaiton of Sample)
+ //should get fixed so negative indexes are properly referenced
+ //or iterators should work
+ ldl = delay.l()[pos.l()];
+ rdl = delay.r()[pos.r()];
ldl = ldl * (1.0 - lrcross) + rdl * lrcross;
rdl = rdl * (1.0 - lrcross) + ldl * lrcross;
efxoutl[i] = ldl * 2.0;
efxoutr[i] = rdl * 2.0;
+ if(rdl != rdl) {
+ cout << "hi" << hidamp << endl;
+ cout << "l" << ldl << endl;
+ cout << "r" << rdl << endl;
+ cout << "ol " << efxoutl[i] << endl;
+ cout << "or " << efxoutr[i] << endl;
+ cout << "cross " << lrcross << endl;
+ cout << pos.l() << endl;
+ cout << pos.r() << endl;
+ cout << input.l()[0] << endl;
+ cout << input.r()[0] << endl;
+ for(int i=pos.l()-SOUND_BUFFER_SIZE; i<pos.l(); ++i)
+ cout << i << ": " << delay.l()[i] << endl;
+ exit(1);
+ }
ldl = input.l()[i] * panning - ldl * fb;
rdl = input.r()[i] * (1.0 - panning) - rdl * fb;
//LowPass Filter
- old.l() = delaySample.l()[itr] = ldl * hidamp + old.l() * (1.0 - hidamp);
- old.r() = delaySample.r()[itr] = rdl * hidamp + old.r() * (1.0 - hidamp);
- ++itr;
+ old.l() = delay.l()[pos.l()]
+ = ldl * hidamp + old.l() * (1.0 - hidamp);
+ old.r() = delay.r()[pos.r()]
+ = rdl * hidamp + old.r() * (1.0 - hidamp);
+ ++pos.l();
+ ++pos.r();
}
- itr %= maxDelay;
+ pos.l() %= delay.l().size();
+ pos.r() %= delay.r().size();
pthread_mutex_unlock(&mutex);
}
@@ -162,7 +166,7 @@ void Echo::setpanning(unsigned char Ppanning)
void Echo::setdelay(unsigned char Pdelay)
{
- delay.setmVal(Pdelay);
+ delayCtl.setmVal(Pdelay);
//this->Pdelay=Pdelay;
//delay=1+(int)(Pdelay/127.0*SAMPLE_RATE*1.5);//0 .. 1.5 sec
initdelays();
@@ -272,7 +276,7 @@ unsigned char Echo::getpar(int npar) const
return Ppanning;
break;
case 2:
- return delay.getmVal();
+ return delayCtl.getmVal();
break;
case 3:
return Plrdelay;
diff --git a/src/Effects/Echo.h b/src/Effects/Echo.h
@@ -103,7 +103,7 @@ class Echo:public Effect
//Parameters
char Pvolume; /**<#1 Volume or Dry/Wetness*/
char Ppanning; /**<#2 Panning*/
- DelayCtl delay; /**<#3 Delay of the Echo*/
+ DelayCtl delayCtl; /**<#3 Delay of the Echo*/
char Plrdelay; /**<#4 L/R delay difference*/
char Plrcross; /**<#5 L/R Mixing*/
char Pfb; /**<#6Feedback*/
@@ -120,17 +120,16 @@ class Echo:public Effect
//Real Parameters
REALTYPE panning, lrcross, fb, hidamp; //needs better names
//Left/Right delay lengths
+ Stereo<int> delayTime;
int dl, dr, lrdelay;
-// int ndl, ndr; //used for shifting delay amounts
-
void initdelays();
- Stereo<Sample> delaySample;
+ //2 channel ring buffer
+ Stereo<Sample> delay;
Stereo<REALTYPE> old;
- int itr;
- //int kl, kr;
- int maxDelay;
+ //position of reading/writing from delaysample
+ Stereo<int> pos;
mutable pthread_mutex_t mutex;
};
diff --git a/src/Samples/Sample.cpp b/src/Samples/Sample.cpp
@@ -20,8 +20,11 @@
*/
#include <cmath>
#include <cstring>//for memcpy/memset
+#include <iostream>
#include "Sample.h"
+using namespace std;
+
#warning TODO Think about renaming Sample to Frame
/**\TODO start using pointer math here as these will be Frequency called
* functions throughout the code*/
@@ -103,52 +106,21 @@ bool Sample::operator==(const Sample &smp) const
* @param xb X of point b
* @return estimated Y of test point
*/
-float linearEstimate(float ya, float yb, float xt, float xa = 0.0, float xb =1.0)
+float linearEstimate(float ya, float yb, float xt, int xa = 0, int xb = 1)
{
-#warning TODO this could be done with a good bit less computation
- //Lets make this simple by normalizing the x axis
+ if(xa == xb)
+ return ya;
//Normalize point a
- xb -= xa;
- xt -= xa;
- xa -= xa;
+ //xb -= xa;
+ //xt -= xa;
//Normalize point b
- xt /= xb;
- xb /= xb;
+ //xt /= xb;
//Now xa=0 xb=1 0<=xt<=1
//simpily use y=mx+b
- return (yb-ya) * xt + ya;
-}
-
-
-void Sample::resample(const unsigned int rate, const unsigned int nrate)
-{
- //does not call resize, as I have a feeling that that could lose precision
- //(have not tested, so feel free to prove me wrong)
- if(rate == nrate)
- return; //no resampling here
- else {//resampling occurs here
- int itr = 0;
- float ratio = (nrate * 1.0) / (rate * 1.0);
-
- int nBufferSize = (int)bufferSize * ratio;
- float *nBuffer = new float[nBufferSize];
-
- //addition is done to avoid 0 edge case
- for(int i = 0; i < nBufferSize; ++i)
- nBuffer[i] = linearEstimate(buffer[(int)floor(i/ratio)],
- buffer[(int)ceil((i+1)/ratio)],
- i,
- floor(i/ratio),
- ceil((i+1)/ratio));
-
- //put the new data in
- delete buffer;
- buffer = nBuffer;
- bufferSize = nBufferSize;
- }
+ return (yb-ya) * (xt-xa)/(xb-xa) + ya;
}
void Sample::resize(unsigned int nsize)
@@ -162,16 +134,42 @@ void Sample::resize(unsigned int nsize)
int nBufferSize = nsize;
float *nBuffer = new float[nBufferSize];
+ //take care of edge cases
+ *nBuffer = *buffer;
+ *(nBuffer+nBufferSize-1) = *(buffer+bufferSize-1);
+
//addition is done to avoid 0 edge case
- for(int i = 0; i < nBufferSize; ++i)
- nBuffer[i] = linearEstimate(buffer[(int)floor(i/ratio)],
- buffer[(int)ceil((i+1)/ratio)],
- i,
- floor(i/ratio),
- ceil((i+1)/ratio));
+ for(int i = 1; i < nBufferSize - 1; ++i)
+ {
+ float left = floor(i/ratio);
+ float right = ceil((i+1)/ratio);
+ float test = i/ratio;
+ if(left > bufferSize - 1)
+ left = bufferSize - 1;
+ if(right > bufferSize - 1)
+ right = bufferSize - 1;
+ if(left > test)
+ test = left;
+ nBuffer[i] = linearEstimate(buffer[(int)left],
+ buffer[(int)right],
+ test, (int)left, (int)right);
+ if(nBuffer[i] != nBuffer[i])
+ {
+ cout << "ERROR: " << nBuffer[i] << endl;
+ cout << "ERROR2: " << buffer[(int)left] << endl;
+ cout << "ERROR33: " << buffer[(int)right] << endl;
+ cout << "ERROR444: " << right << endl;
+ cout << "ERROR5555: " << left << endl;
+ cout << "ERROR66666: " << i << endl;
+ cout << "ERROR7777: " << i/ratio << endl;
+ cout << "ERROR888: " << test << endl;
+ exit(1);
+ }
+
+ }
//put the new data in
- delete buffer;
+ delete[] buffer;
buffer = nBuffer;
bufferSize = nBufferSize;
}
diff --git a/src/Samples/Sample.h b/src/Samples/Sample.h
@@ -57,9 +57,6 @@ class Sample
* sparingly*/
const REALTYPE *c_buf() const {return buffer;}
- /**Change the sampling rate of the Sample*/
- void resample(const unsigned int rate, const unsigned int nrate);
-
/**Change the size of the sample*/
void resize(unsigned int nsize);
