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 --- .../Fracture.xcodeproj/christopherjohnson.pbxuser | 4 +- .../christopherjohnson.perspectivev3 | 13 ++--- plugins/MacVST/Fracture/source/Fracture.cpp | 7 +-- plugins/MacVST/Fracture/source/Fracture.h | 7 +-- plugins/MacVST/Fracture/source/FractureProc.cpp | 62 +++++++--------------- 5 files changed, 31 insertions(+), 62 deletions(-) (limited to 'plugins/MacVST/Fracture') diff --git a/plugins/MacVST/Fracture/Fracture.xcodeproj/christopherjohnson.pbxuser b/plugins/MacVST/Fracture/Fracture.xcodeproj/christopherjohnson.pbxuser index 319327c..46f29ff 100755 --- a/plugins/MacVST/Fracture/Fracture.xcodeproj/christopherjohnson.pbxuser +++ b/plugins/MacVST/Fracture/Fracture.xcodeproj/christopherjohnson.pbxuser @@ -49,8 +49,8 @@ PBXFileDataSource_Warnings_ColumnID, ); }; - PBXPerProjectTemplateStateSaveDate = 528460537; - PBXWorkspaceStateSaveDate = 528460537; + PBXPerProjectTemplateStateSaveDate = 569735404; + PBXWorkspaceStateSaveDate = 569735404; }; sourceControlManager = 8B02375E1D42B1C400E1E8C8 /* Source Control */; userBuildSettings = { diff --git a/plugins/MacVST/Fracture/Fracture.xcodeproj/christopherjohnson.perspectivev3 b/plugins/MacVST/Fracture/Fracture.xcodeproj/christopherjohnson.perspectivev3 index 3c29fa7..da6f297 100755 --- a/plugins/MacVST/Fracture/Fracture.xcodeproj/christopherjohnson.perspectivev3 +++ b/plugins/MacVST/Fracture/Fracture.xcodeproj/christopherjohnson.perspectivev3 @@ -339,13 +339,15 @@ PBXProjectModuleGUID 8B0237581D42B1C400E1E8C8 PBXProjectModuleLabel - <No Editor> + PBXSplitModuleInNavigatorKey Split0 PBXProjectModuleGUID 8B0237591D42B1C400E1E8C8 + PBXProjectModuleLabel + SplitCount 1 @@ -467,11 +469,11 @@ TableOfContents - 8B9D7A301F7FAB0C007AB60F + 8B793A8421F578F8006E9731 1CA23ED40692098700951B8B - 8B9D7A311F7FAB0C007AB60F + 8B793A8521F578F8006E9731 8B0237581D42B1C400E1E8C8 - 8B9D7A321F7FAB0C007AB60F + 8B793A8621F578F8006E9731 1CA23EDF0692099D00951B8B 1CA23EE00692099D00951B8B 1CA23EE10692099D00951B8B @@ -624,7 +626,7 @@ StatusbarIsVisible TimeStamp - 528460556.044348 + 569735416.520316 ToolbarConfigUserDefaultsMinorVersion 2 ToolbarDisplayMode @@ -641,7 +643,6 @@ 5 WindowOrderList - 8B9D7A331F7FAB0C007AB60F /Users/christopherjohnson/Desktop/MacVST/Fracture/Fracture.xcodeproj WindowString diff --git a/plugins/MacVST/Fracture/source/Fracture.cpp b/plugins/MacVST/Fracture/source/Fracture.cpp index 255475a..03f3b19 100755 --- a/plugins/MacVST/Fracture/source/Fracture.cpp +++ b/plugins/MacVST/Fracture/source/Fracture.cpp @@ -16,11 +16,8 @@ Fracture::Fracture(audioMasterCallback audioMaster) : B = 0.5; //2 from 1 to 3: (B*2.999)+1 C = 1.0; D = 1.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/Fracture/source/Fracture.h b/plugins/MacVST/Fracture/source/Fracture.h index 659f94b..49d2718 100755 --- a/plugins/MacVST/Fracture/source/Fracture.h +++ b/plugins/MacVST/Fracture/source/Fracture.h @@ -55,11 +55,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/MacVST/Fracture/source/FractureProc.cpp b/plugins/MacVST/Fracture/source/FractureProc.cpp index 8e217d8..5c1aaa9 100755 --- a/plugins/MacVST/Fracture/source/FractureProc.cpp +++ b/plugins/MacVST/Fracture/source/FractureProc.cpp @@ -14,9 +14,6 @@ void Fracture::processReplacing(float **inputs, float **outputs, VstInt32 sample float* out1 = outputs[0]; float* out2 = outputs[1]; - float fpTemp; - long double fpOld = 0.618033988749894848204586; //golden ratio! - long double fpNew = 1.0 - fpOld; double density = A*4; double fracture = (((B*2.999)+1)*3.14159265358979); @@ -101,25 +98,14 @@ void Fracture::processReplacing(float **inputs, float **outputs, VstInt32 sample inputSampleL = (drySampleL * dry)+(inputSampleL * wet); inputSampleR = (drySampleR * dry)+(inputSampleR * wet); - //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; @@ -141,9 +127,6 @@ void Fracture::processDoubleReplacing(double **inputs, double **outputs, VstInt3 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 density = A*4; double fracture = (((B*2.999)+1)*3.14159265358979); @@ -228,25 +211,16 @@ void Fracture::processDoubleReplacing(double **inputs, double **outputs, VstInt3 inputSampleL = (drySampleL * dry)+(inputSampleL * wet); inputSampleR = (drySampleR * dry)+(inputSampleR * wet); - //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