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 --- .../TubeDesk.xcodeproj/christopherjohnson.pbxuser | 8 +-- .../christopherjohnson.perspectivev3 | 21 ++++---- plugins/MacVST/TubeDesk/source/TubeDesk.cpp | 7 +-- plugins/MacVST/TubeDesk/source/TubeDesk.h | 7 +-- plugins/MacVST/TubeDesk/source/TubeDeskProc.cpp | 62 +++++++--------------- 5 files changed, 36 insertions(+), 69 deletions(-) (limited to 'plugins/MacVST/TubeDesk') diff --git a/plugins/MacVST/TubeDesk/TubeDesk.xcodeproj/christopherjohnson.pbxuser b/plugins/MacVST/TubeDesk/TubeDesk.xcodeproj/christopherjohnson.pbxuser index 39db978..f2588de 100755 --- a/plugins/MacVST/TubeDesk/TubeDesk.xcodeproj/christopherjohnson.pbxuser +++ b/plugins/MacVST/TubeDesk/TubeDesk.xcodeproj/christopherjohnson.pbxuser @@ -49,11 +49,11 @@ PBXFileDataSource_Warnings_ColumnID, ); }; - PBXPerProjectTemplateStateSaveDate = 528463849; - PBXWorkspaceStateSaveDate = 528463849; + PBXPerProjectTemplateStateSaveDate = 569773377; + PBXWorkspaceStateSaveDate = 569773377; }; perUserProjectItems = { - 8B9D71EC1F7EFB47007AB60F /* PBXTextBookmark */ = 8B9D71EC1F7EFB47007AB60F /* PBXTextBookmark */; + 8B79424F21F60D4A006E9731 /* PBXTextBookmark */ = 8B79424F21F60D4A006E9731 /* PBXTextBookmark */; 8B9D7FBF1F7FB7FA007AB60F /* PBXTextBookmark */ = 8B9D7FBF1F7FB7FA007AB60F /* PBXTextBookmark */; }; sourceControlManager = 8B02375E1D42B1C400E1E8C8 /* Source Control */; @@ -106,7 +106,7 @@ isa = PBXCodeSenseManager; indexTemplatePath = ""; }; - 8B9D71EC1F7EFB47007AB60F /* PBXTextBookmark */ = { + 8B79424F21F60D4A006E9731 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 24A2FFDB0F90D1DD003BB5A7 /* audioeffectx.cpp */; name = "audioeffectx.cpp: 307"; diff --git a/plugins/MacVST/TubeDesk/TubeDesk.xcodeproj/christopherjohnson.perspectivev3 b/plugins/MacVST/TubeDesk/TubeDesk.xcodeproj/christopherjohnson.perspectivev3 index b3bcad8..a09ec6b 100755 --- a/plugins/MacVST/TubeDesk/TubeDesk.xcodeproj/christopherjohnson.perspectivev3 +++ b/plugins/MacVST/TubeDesk/TubeDesk.xcodeproj/christopherjohnson.perspectivev3 @@ -351,10 +351,10 @@ _historyCapacity 0 bookmark - 8B9D7FBF1F7FB7FA007AB60F + 8B79424F21F60D4A006E9731 history - 8B9D71EC1F7EFB47007AB60F + 8B9D7FBF1F7FB7FA007AB60F SplitCount @@ -368,18 +368,18 @@ GeometryConfiguration Frame - {{0, 0}, {603, 13}} + {{0, 0}, {603, 0}} RubberWindowFrame 422 271 810 487 0 0 1440 878 Module PBXNavigatorGroup Proportion - 13pt + 0pt Proportion - 428pt + 441pt Tabs @@ -393,7 +393,7 @@ GeometryConfiguration Frame - {{10, 27}, {603, 401}} + {{10, 27}, {603, 414}} RubberWindowFrame 422 271 810 487 0 0 1440 878 @@ -477,11 +477,11 @@ TableOfContents - 8B9D7FC01F7FB7FA007AB60F + 8B79425021F60D4A006E9731 1CA23ED40692098700951B8B - 8B9D7FC11F7FB7FA007AB60F + 8B79425121F60D4A006E9731 8B0237581D42B1C400E1E8C8 - 8B9D7FC21F7FB7FA007AB60F + 8B79425221F60D4A006E9731 1CA23EDF0692099D00951B8B 1CA23EE00692099D00951B8B 1CA23EE10692099D00951B8B @@ -634,7 +634,7 @@ StatusbarIsVisible TimeStamp - 528463866.70419401 + 569773386.273072 ToolbarConfigUserDefaultsMinorVersion 2 ToolbarDisplayMode @@ -651,7 +651,6 @@ 5 WindowOrderList - 8B9D7FC31F7FB7FA007AB60F /Users/christopherjohnson/Desktop/MacVST/TubeDesk/TubeDesk.xcodeproj WindowString diff --git a/plugins/MacVST/TubeDesk/source/TubeDesk.cpp b/plugins/MacVST/TubeDesk/source/TubeDesk.cpp index fc4bd75..5a7465c 100755 --- a/plugins/MacVST/TubeDesk/source/TubeDesk.cpp +++ b/plugins/MacVST/TubeDesk/source/TubeDesk.cpp @@ -25,11 +25,8 @@ TubeDesk::TubeDesk(audioMasterCallback audioMaster) : lastOutSampleR = 0.0; lastSlewR = 0.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/TubeDesk/source/TubeDesk.h b/plugins/MacVST/TubeDesk/source/TubeDesk.h index b41b283..fb15768 100755 --- a/plugins/MacVST/TubeDesk/source/TubeDesk.h +++ b/plugins/MacVST/TubeDesk/source/TubeDesk.h @@ -51,11 +51,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 int gcount; diff --git a/plugins/MacVST/TubeDesk/source/TubeDeskProc.cpp b/plugins/MacVST/TubeDesk/source/TubeDeskProc.cpp index 2636076..cccf6e2 100755 --- a/plugins/MacVST/TubeDesk/source/TubeDeskProc.cpp +++ b/plugins/MacVST/TubeDesk/source/TubeDeskProc.cpp @@ -17,9 +17,6 @@ void TubeDesk::processReplacing(float **inputs, float **outputs, VstInt32 sample 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 intensity = 0.4384938; double depthA = 549.0; @@ -199,25 +196,14 @@ void TubeDesk::processReplacing(float **inputs, float **outputs, VstInt32 sample gcount--; - //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; @@ -239,9 +225,6 @@ void TubeDesk::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 intensity = 0.4384938; double depthA = 549.0; @@ -421,25 +404,16 @@ void TubeDesk::processDoubleReplacing(double **inputs, double **outputs, VstInt3 gcount--; - //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