diff options
author | Chris Johnson <jinx6568@sover.net> | 2019-01-27 21:13:54 -0500 |
---|---|---|
committer | Chris Johnson <jinx6568@sover.net> | 2019-01-27 21:13:54 -0500 |
commit | 966f2d253cd2ee6ce140ad68095a20a9d2b63052 (patch) | |
tree | b0400d95bd06512531ade6ddf55190a58b6a5623 /plugins/LinuxVST/src/EveryTrim | |
parent | 0887543349dbbec0721a1fc8b1c7deba9afefa8b (diff) | |
download | airwindows-lv2-port-966f2d253cd2ee6ce140ad68095a20a9d2b63052.tar.gz airwindows-lv2-port-966f2d253cd2ee6ce140ad68095a20a9d2b63052.tar.bz2 airwindows-lv2-port-966f2d253cd2ee6ce140ad68095a20a9d2b63052.zip |
Floating Point Dither For All
Diffstat (limited to 'plugins/LinuxVST/src/EveryTrim')
-rwxr-xr-x | plugins/LinuxVST/src/EveryTrim/.vs/Console4Channel64/v14/.suo | bin | 0 -> 32768 bytes | |||
-rwxr-xr-x | plugins/LinuxVST/src/EveryTrim/.vs/VSTProject/v14/.suo | bin | 0 -> 23040 bytes | |||
-rwxr-xr-x | plugins/LinuxVST/src/EveryTrim/EveryTrim.cpp | 7 | ||||
-rwxr-xr-x | plugins/LinuxVST/src/EveryTrim/EveryTrim.h | 7 | ||||
-rwxr-xr-x | plugins/LinuxVST/src/EveryTrim/EveryTrimProc.cpp | 62 |
5 files changed, 22 insertions, 54 deletions
diff --git a/plugins/LinuxVST/src/EveryTrim/.vs/Console4Channel64/v14/.suo b/plugins/LinuxVST/src/EveryTrim/.vs/Console4Channel64/v14/.suo Binary files differnew file mode 100755 index 0000000..777b846 --- /dev/null +++ b/plugins/LinuxVST/src/EveryTrim/.vs/Console4Channel64/v14/.suo diff --git a/plugins/LinuxVST/src/EveryTrim/.vs/VSTProject/v14/.suo b/plugins/LinuxVST/src/EveryTrim/.vs/VSTProject/v14/.suo Binary files differnew file mode 100755 index 0000000..649aa5c --- /dev/null +++ b/plugins/LinuxVST/src/EveryTrim/.vs/VSTProject/v14/.suo diff --git a/plugins/LinuxVST/src/EveryTrim/EveryTrim.cpp b/plugins/LinuxVST/src/EveryTrim/EveryTrim.cpp index 1e81d35..b0a98d4 100755 --- a/plugins/LinuxVST/src/EveryTrim/EveryTrim.cpp +++ b/plugins/LinuxVST/src/EveryTrim/EveryTrim.cpp @@ -17,11 +17,8 @@ EveryTrim::EveryTrim(audioMasterCallback audioMaster) : C = 0.5; D = 0.5; E = 0.5; - fpNShapeLA = 0.0; - fpNShapeLB = 0.0; - fpNShapeRA = 0.0; - fpNShapeRB = 0.0; - fpFlip = true; + fpNShapeL = 0.0; + fpNShapeR = 0.0; //this is reset: values being initialized only once. Startup values, whatever they are. _canDo.insert("plugAsChannelInsert"); // plug-in can be used as a channel insert effect. diff --git a/plugins/LinuxVST/src/EveryTrim/EveryTrim.h b/plugins/LinuxVST/src/EveryTrim/EveryTrim.h index 28d9c27..4efc3cd 100755 --- a/plugins/LinuxVST/src/EveryTrim/EveryTrim.h +++ b/plugins/LinuxVST/src/EveryTrim/EveryTrim.h @@ -56,11 +56,8 @@ private: char _programName[kVstMaxProgNameLen + 1]; std::set< std::string > _canDo; - long double fpNShapeLA; - long double fpNShapeLB; - long double fpNShapeRA; - long double fpNShapeRB; - bool fpFlip; + long double fpNShapeL; + long double fpNShapeR; //default stuff float A; diff --git a/plugins/LinuxVST/src/EveryTrim/EveryTrimProc.cpp b/plugins/LinuxVST/src/EveryTrim/EveryTrimProc.cpp index 30d764f..3c30eda 100755 --- a/plugins/LinuxVST/src/EveryTrim/EveryTrimProc.cpp +++ b/plugins/LinuxVST/src/EveryTrim/EveryTrimProc.cpp @@ -14,9 +14,6 @@ void EveryTrim::processReplacing(float **inputs, float **outputs, VstInt32 sampl float* out1 = outputs[0]; float* out2 = outputs[1]; - float fpTemp; - long double fpOld = 0.618033988749894848204586; //golden ratio! - long double fpNew = 1.0 - fpOld; double leftgain = pow(10.0,((A*24.0)-12.0)/20.0); double rightgain = pow(10.0,((B*24.0)-12.0)/20.0); @@ -83,25 +80,14 @@ void EveryTrim::processReplacing(float **inputs, float **outputs, VstInt32 sampl inputSampleR = (mid-side) * rightgain; //contains mastergain and the gain trim fixing the mid/side - //noise shaping to 32-bit floating point - if (fpFlip) { - fpTemp = inputSampleL; - fpNShapeLA = (fpNShapeLA*fpOld)+((inputSampleL-fpTemp)*fpNew); - inputSampleL += fpNShapeLA; - fpTemp = inputSampleR; - fpNShapeRA = (fpNShapeRA*fpOld)+((inputSampleR-fpTemp)*fpNew); - inputSampleR += fpNShapeRA; - } - else { - fpTemp = inputSampleL; - fpNShapeLB = (fpNShapeLB*fpOld)+((inputSampleL-fpTemp)*fpNew); - inputSampleL += fpNShapeLB; - fpTemp = inputSampleR; - fpNShapeRB = (fpNShapeRB*fpOld)+((inputSampleR-fpTemp)*fpNew); - inputSampleR += fpNShapeRB; - } - fpFlip = !fpFlip; - //end noise shaping on 32 bit output + //stereo 32 bit dither, made small and tidy. + int expon; frexpf((float)inputSampleL, &expon); + long double dither = (rand()/(RAND_MAX*7.737125245533627e+25))*pow(2,expon+62); + inputSampleL += (dither-fpNShapeL); fpNShapeL = dither; + frexpf((float)inputSampleR, &expon); + dither = (rand()/(RAND_MAX*7.737125245533627e+25))*pow(2,expon+62); + inputSampleR += (dither-fpNShapeR); fpNShapeR = dither; + //end 32 bit dither *out1 = inputSampleL; *out2 = inputSampleR; @@ -120,9 +106,6 @@ void EveryTrim::processDoubleReplacing(double **inputs, double **outputs, VstInt double* out1 = outputs[0]; double* out2 = outputs[1]; - double fpTemp; - long double fpOld = 0.618033988749894848204586; //golden ratio! - long double fpNew = 1.0 - fpOld; double leftgain = pow(10.0,((A*24.0)-12.0)/20.0); double rightgain = pow(10.0,((B*24.0)-12.0)/20.0); @@ -189,25 +172,16 @@ void EveryTrim::processDoubleReplacing(double **inputs, double **outputs, VstInt inputSampleR = (mid-side) * rightgain; //contains mastergain and the gain trim fixing the mid/side - //noise shaping to 64-bit floating point - if (fpFlip) { - fpTemp = inputSampleL; - fpNShapeLA = (fpNShapeLA*fpOld)+((inputSampleL-fpTemp)*fpNew); - inputSampleL += fpNShapeLA; - fpTemp = inputSampleR; - fpNShapeRA = (fpNShapeRA*fpOld)+((inputSampleR-fpTemp)*fpNew); - inputSampleR += fpNShapeRA; - } - else { - fpTemp = inputSampleL; - fpNShapeLB = (fpNShapeLB*fpOld)+((inputSampleL-fpTemp)*fpNew); - inputSampleL += fpNShapeLB; - fpTemp = inputSampleR; - fpNShapeRB = (fpNShapeRB*fpOld)+((inputSampleR-fpTemp)*fpNew); - inputSampleR += fpNShapeRB; - } - fpFlip = !fpFlip; - //end noise shaping on 64 bit output + //stereo 64 bit dither, made small and tidy. + int expon; frexp((double)inputSampleL, &expon); + long double dither = (rand()/(RAND_MAX*7.737125245533627e+25))*pow(2,expon+62); + dither /= 536870912.0; //needs this to scale to 64 bit zone + inputSampleL += (dither-fpNShapeL); fpNShapeL = dither; + frexp((double)inputSampleR, &expon); + dither = (rand()/(RAND_MAX*7.737125245533627e+25))*pow(2,expon+62); + dither /= 536870912.0; //needs this to scale to 64 bit zone + inputSampleR += (dither-fpNShapeR); fpNShapeR = dither; + //end 64 bit dither *out1 = inputSampleL; *out2 = inputSampleR; |