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 --- .../Desk4.xcodeproj/christopherjohnson.pbxuser | 4 +- .../christopherjohnson.perspectivev3 | 9 ++-- plugins/MacVST/Desk4/source/Desk4.cpp | 7 +-- plugins/MacVST/Desk4/source/Desk4.h | 7 +-- plugins/MacVST/Desk4/source/Desk4Proc.cpp | 62 +++++++--------------- 5 files changed, 28 insertions(+), 61 deletions(-) (limited to 'plugins/MacVST/Desk4') diff --git a/plugins/MacVST/Desk4/Desk4.xcodeproj/christopherjohnson.pbxuser b/plugins/MacVST/Desk4/Desk4.xcodeproj/christopherjohnson.pbxuser index bd49c38..e471115 100755 --- a/plugins/MacVST/Desk4/Desk4.xcodeproj/christopherjohnson.pbxuser +++ b/plugins/MacVST/Desk4/Desk4.xcodeproj/christopherjohnson.pbxuser @@ -49,8 +49,8 @@ PBXFileDataSource_Warnings_ColumnID, ); }; - PBXPerProjectTemplateStateSaveDate = 528460121; - PBXWorkspaceStateSaveDate = 528460121; + PBXPerProjectTemplateStateSaveDate = 569734453; + PBXWorkspaceStateSaveDate = 569734453; }; sourceControlManager = 8B02375E1D42B1C400E1E8C8 /* Source Control */; userBuildSettings = { diff --git a/plugins/MacVST/Desk4/Desk4.xcodeproj/christopherjohnson.perspectivev3 b/plugins/MacVST/Desk4/Desk4.xcodeproj/christopherjohnson.perspectivev3 index 86141a5..eb5fa7d 100755 --- a/plugins/MacVST/Desk4/Desk4.xcodeproj/christopherjohnson.perspectivev3 +++ b/plugins/MacVST/Desk4/Desk4.xcodeproj/christopherjohnson.perspectivev3 @@ -469,11 +469,11 @@ TableOfContents - 8B9D794F1F7FA972007AB60F + 8B7937F721F5753E006E9731 1CA23ED40692098700951B8B - 8B9D79501F7FA972007AB60F + 8B7937F821F5753E006E9731 8B0237581D42B1C400E1E8C8 - 8B9D79511F7FA972007AB60F + 8B7937F921F5753E006E9731 1CA23EDF0692099D00951B8B 1CA23EE00692099D00951B8B 1CA23EE10692099D00951B8B @@ -626,7 +626,7 @@ StatusbarIsVisible TimeStamp - 528460146.15257502 + 569734462.79320705 ToolbarConfigUserDefaultsMinorVersion 2 ToolbarDisplayMode @@ -643,7 +643,6 @@ 5 WindowOrderList - 8B9D79521F7FA972007AB60F /Users/christopherjohnson/Desktop/MacVST/Desk4/Desk4.xcodeproj WindowString diff --git a/plugins/MacVST/Desk4/source/Desk4.cpp b/plugins/MacVST/Desk4/source/Desk4.cpp index a8e20a7..0a05d87 100755 --- a/plugins/MacVST/Desk4/source/Desk4.cpp +++ b/plugins/MacVST/Desk4/source/Desk4.cpp @@ -30,11 +30,8 @@ Desk4::Desk4(audioMasterCallback audioMaster) : lastSlewR = 0.0; gcount = 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/Desk4/source/Desk4.h b/plugins/MacVST/Desk4/source/Desk4.h index fa09cd0..802ee47 100755 --- a/plugins/MacVST/Desk4/source/Desk4.h +++ b/plugins/MacVST/Desk4/source/Desk4.h @@ -70,11 +70,8 @@ private: double lastSlewR; int gcount; - 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/MacVST/Desk4/source/Desk4Proc.cpp b/plugins/MacVST/Desk4/source/Desk4Proc.cpp index 515436c..fd165b6 100755 --- a/plugins/MacVST/Desk4/source/Desk4Proc.cpp +++ b/plugins/MacVST/Desk4/source/Desk4Proc.cpp @@ -17,9 +17,6 @@ void Desk4::processReplacing(float **inputs, float **outputs, VstInt32 sampleFra double overallscale = 1.0; overallscale /= 44100.0; overallscale *= getSampleRate(); - float fpTemp; - long double fpOld = 0.618033988749894848204586; //golden ratio! - long double fpNew = 1.0 - fpOld; double gain = (pow(A,2)*10)+0.0001; double gaintrim = (pow(A,2)*2)+1.0; @@ -229,25 +226,14 @@ void Desk4::processReplacing(float **inputs, float **outputs, VstInt32 sampleFra } - //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; @@ -269,9 +255,6 @@ void Desk4::processDoubleReplacing(double **inputs, double **outputs, VstInt32 s 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; double gain = (pow(A,2)*10)+0.0001; double gaintrim = (pow(A,2)*2)+1.0; @@ -481,25 +464,16 @@ void Desk4::processDoubleReplacing(double **inputs, double **outputs, VstInt32 s } - //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