From 966f2d253cd2ee6ce140ad68095a20a9d2b63052 Mon Sep 17 00:00:00 2001 From: Chris Johnson Date: Sun, 27 Jan 2019 21:13:54 -0500 Subject: Floating Point Dither For All --- .../Tremolo.xcodeproj/christopherjohnson.pbxuser | 8 +-- .../christopherjohnson.perspectivev3 | 13 +++-- plugins/MacVST/Tremolo/source/Tremolo.cpp | 7 +-- plugins/MacVST/Tremolo/source/Tremolo.h | 7 +-- plugins/MacVST/Tremolo/source/TremoloProc.cpp | 62 +++++++--------------- 5 files changed, 32 insertions(+), 65 deletions(-) (limited to 'plugins/MacVST/Tremolo') diff --git a/plugins/MacVST/Tremolo/Tremolo.xcodeproj/christopherjohnson.pbxuser b/plugins/MacVST/Tremolo/Tremolo.xcodeproj/christopherjohnson.pbxuser index eabc2fb..170e53c 100755 --- a/plugins/MacVST/Tremolo/Tremolo.xcodeproj/christopherjohnson.pbxuser +++ b/plugins/MacVST/Tremolo/Tremolo.xcodeproj/christopherjohnson.pbxuser @@ -49,11 +49,11 @@ PBXFileDataSource_Warnings_ColumnID, ); }; - PBXPerProjectTemplateStateSaveDate = 528463825; - PBXWorkspaceStateSaveDate = 528463825; + PBXPerProjectTemplateStateSaveDate = 569773339; + PBXWorkspaceStateSaveDate = 569773339; }; perUserProjectItems = { - 8B9D71CC1F7EFAE7007AB60F /* PBXTextBookmark */ = 8B9D71CC1F7EFAE7007AB60F /* PBXTextBookmark */; + 8B79422F21F60D22006E9731 /* PBXTextBookmark */ = 8B79422F21F60D22006E9731 /* PBXTextBookmark */; 8B9D7F9F1F7FB7DF007AB60F /* PBXTextBookmark */ = 8B9D7F9F1F7FB7DF007AB60F /* PBXTextBookmark */; }; sourceControlManager = 8B02375E1D42B1C400E1E8C8 /* Source Control */; @@ -106,7 +106,7 @@ isa = PBXCodeSenseManager; indexTemplatePath = ""; }; - 8B9D71CC1F7EFAE7007AB60F /* PBXTextBookmark */ = { + 8B79422F21F60D22006E9731 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 24A2FFDB0F90D1DD003BB5A7 /* audioeffectx.cpp */; name = "audioeffectx.cpp: 307"; diff --git a/plugins/MacVST/Tremolo/Tremolo.xcodeproj/christopherjohnson.perspectivev3 b/plugins/MacVST/Tremolo/Tremolo.xcodeproj/christopherjohnson.perspectivev3 index 16e3a4d..2a3782e 100755 --- a/plugins/MacVST/Tremolo/Tremolo.xcodeproj/christopherjohnson.perspectivev3 +++ b/plugins/MacVST/Tremolo/Tremolo.xcodeproj/christopherjohnson.perspectivev3 @@ -351,10 +351,10 @@ _historyCapacity 0 bookmark - 8B9D7F9F1F7FB7DF007AB60F + 8B79422F21F60D22006E9731 history - 8B9D71CC1F7EFAE7007AB60F + 8B9D7F9F1F7FB7DF007AB60F SplitCount @@ -477,11 +477,11 @@ TableOfContents - 8B9D7FA01F7FB7DF007AB60F + 8B79423021F60D22006E9731 1CA23ED40692098700951B8B - 8B9D7FA11F7FB7DF007AB60F + 8B79423121F60D22006E9731 8B0237581D42B1C400E1E8C8 - 8B9D7FA21F7FB7DF007AB60F + 8B79423221F60D22006E9731 1CA23EDF0692099D00951B8B 1CA23EE00692099D00951B8B 1CA23EE10692099D00951B8B @@ -634,7 +634,7 @@ StatusbarIsVisible TimeStamp - 528463839.58097899 + 569773346.55622005 ToolbarConfigUserDefaultsMinorVersion 2 ToolbarDisplayMode @@ -651,7 +651,6 @@ 5 WindowOrderList - 8B9D7FA31F7FB7DF007AB60F /Users/christopherjohnson/Desktop/MacVST/Tremolo/Tremolo.xcodeproj WindowString diff --git a/plugins/MacVST/Tremolo/source/Tremolo.cpp b/plugins/MacVST/Tremolo/source/Tremolo.cpp index be5d06d..f0b649d 100755 --- a/plugins/MacVST/Tremolo/source/Tremolo.cpp +++ b/plugins/MacVST/Tremolo/source/Tremolo.cpp @@ -21,11 +21,8 @@ Tremolo::Tremolo(audioMasterCallback audioMaster) : depthAmount = 0.0; lastSpeed = 1000.0; lastDepth = 1000.0; - 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/MacVST/Tremolo/source/Tremolo.h b/plugins/MacVST/Tremolo/source/Tremolo.h index ea40aa6..11fc718 100755 --- a/plugins/MacVST/Tremolo/source/Tremolo.h +++ b/plugins/MacVST/Tremolo/source/Tremolo.h @@ -53,11 +53,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 double sweep; diff --git a/plugins/MacVST/Tremolo/source/TremoloProc.cpp b/plugins/MacVST/Tremolo/source/TremoloProc.cpp index d0de7cc..d27dc86 100755 --- a/plugins/MacVST/Tremolo/source/TremoloProc.cpp +++ b/plugins/MacVST/Tremolo/source/TremoloProc.cpp @@ -17,9 +17,6 @@ void Tremolo::processReplacing(float **inputs, float **outputs, VstInt32 sampleF double overallscale = 1.0; overallscale /= 44100.0; overallscale *= getSampleRate(); - float fpTemp; - long double fpOld = 0.618033988749894848204586; //golden ratio! - long double fpNew = 1.0 - fpOld; speedChase = pow(A,4); depthChase = B; @@ -151,25 +148,14 @@ void Tremolo::processReplacing(float **inputs, float **outputs, VstInt32 sampleF inputSampleR = (drySampleR * (1-depth)) + (inputSampleR*depth); //end R - //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; @@ -191,9 +177,6 @@ void Tremolo::processDoubleReplacing(double **inputs, double **outputs, VstInt32 double overallscale = 1.0; overallscale /= 44100.0; overallscale *= getSampleRate(); - double fpTemp; //this is different from singlereplacing - long double fpOld = 0.618033988749894848204586; //golden ratio! - long double fpNew = 1.0 - fpOld; speedChase = pow(A,4); depthChase = B; @@ -326,25 +309,16 @@ void Tremolo::processDoubleReplacing(double **inputs, double **outputs, VstInt32 inputSampleR = (drySampleR * (1-depth)) + (inputSampleR*depth); //end R - //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; -- cgit v1.2.3