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 --- .../christopherjohnson.pbxuser | 24 ++++---- .../christopherjohnson.perspectivev3 | 30 +++++----- .../GuitarConditioner/source/GuitarConditioner.cpp | 7 +-- .../GuitarConditioner/source/GuitarConditioner.h | 9 +-- .../source/GuitarConditionerProc.cpp | 67 ++++++++-------------- 5 files changed, 55 insertions(+), 82 deletions(-) (limited to 'plugins/MacVST/GuitarConditioner') diff --git a/plugins/MacVST/GuitarConditioner/GuitarConditioner.xcodeproj/christopherjohnson.pbxuser b/plugins/MacVST/GuitarConditioner/GuitarConditioner.xcodeproj/christopherjohnson.pbxuser index c50d00a..878b3b6 100755 --- a/plugins/MacVST/GuitarConditioner/GuitarConditioner.xcodeproj/christopherjohnson.pbxuser +++ b/plugins/MacVST/GuitarConditioner/GuitarConditioner.xcodeproj/christopherjohnson.pbxuser @@ -49,13 +49,13 @@ PBXFileDataSource_Warnings_ColumnID, ); }; - PBXPerProjectTemplateStateSaveDate = 528460599; - PBXWorkspaceStateSaveDate = 528460599; + PBXPerProjectTemplateStateSaveDate = 569735678; + PBXWorkspaceStateSaveDate = 569735678; }; perUserProjectItems = { 8B55B2CB1D5E372E00B8D4D6 /* PBXTextBookmark */ = 8B55B2CB1D5E372E00B8D4D6 /* PBXTextBookmark */; - 8B9D6C941F7EE6EE007AB60F /* PBXTextBookmark */ = 8B9D6C941F7EE6EE007AB60F /* PBXTextBookmark */; - 8B9D7A791F7FAB58007AB60F /* PBXTextBookmark */ = 8B9D7A791F7FAB58007AB60F /* PBXTextBookmark */; + 8B793B2521F57A02006E9731 /* PBXTextBookmark */ = 8B793B2521F57A02006E9731 /* PBXTextBookmark */; + 8B793B3421F57A3B006E9731 /* PBXTextBookmark */ = 8B793B3421F57A3B006E9731 /* PBXTextBookmark */; 8BA186921D49975600F8B3DC /* PBXTextBookmark */ = 8BA186921D49975600F8B3DC /* PBXTextBookmark */; }; sourceControlManager = 8B02375E1D42B1C400E1E8C8 /* Source Control */; @@ -64,15 +64,15 @@ }; 2407DEB6089929BA00EB68BF /* GuitarConditioner.cpp */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {848, 1365}}"; - sepNavSelRange = "{3738, 0}"; - sepNavVisRange = "{1973, 2300}"; + sepNavIntBoundsRect = "{{0, 0}, {848, 1287}}"; + sepNavSelRange = "{558, 0}"; + sepNavVisRange = "{0, 2385}"; sepNavWindowFrame = "{{46, 47}, {895, 831}}"; }; }; 245463B80991757100464AD3 /* GuitarConditioner.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {554, 1014}}"; + sepNavIntBoundsRect = "{{0, 0}, {554, 975}}"; sepNavSelRange = "{0, 0}"; sepNavVisRange = "{0, 0}"; sepNavWindowFrame = "{{20, 47}, {895, 831}}"; @@ -113,22 +113,22 @@ fRef = 2407DEB6089929BA00EB68BF /* GuitarConditioner.cpp */; name = "Gain.cpp: 103"; rLen = 0; - rLoc = 3202; + rLoc = 3216; rType = 0; vrLen = 156; vrLoc = 3340; }; - 8B9D6C941F7EE6EE007AB60F /* PBXTextBookmark */ = { + 8B793B2521F57A02006E9731 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 245463B80991757100464AD3 /* GuitarConditioner.h */; name = "GuitarConditioner.h: 1"; rLen = 0; rLoc = 0; rType = 0; - vrLen = 88; + vrLen = 0; vrLoc = 0; }; - 8B9D7A791F7FAB58007AB60F /* PBXTextBookmark */ = { + 8B793B3421F57A3B006E9731 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 245463B80991757100464AD3 /* GuitarConditioner.h */; name = "GuitarConditioner.h: 1"; diff --git a/plugins/MacVST/GuitarConditioner/GuitarConditioner.xcodeproj/christopherjohnson.perspectivev3 b/plugins/MacVST/GuitarConditioner/GuitarConditioner.xcodeproj/christopherjohnson.perspectivev3 index 01d3095..dc3886b 100755 --- a/plugins/MacVST/GuitarConditioner/GuitarConditioner.xcodeproj/christopherjohnson.perspectivev3 +++ b/plugins/MacVST/GuitarConditioner/GuitarConditioner.xcodeproj/christopherjohnson.perspectivev3 @@ -300,7 +300,7 @@ PBXSmartGroupTreeModuleOutlineStateSelectionKey - 6 + 7 4 0 @@ -351,12 +351,12 @@ _historyCapacity 0 bookmark - 8B9D7A791F7FAB58007AB60F + 8B793B3421F57A3B006E9731 history 8BA186921D49975600F8B3DC 8B55B2CB1D5E372E00B8D4D6 - 8B9D6C941F7EE6EE007AB60F + 8B793B2521F57A02006E9731 SplitCount @@ -370,18 +370,18 @@ GeometryConfiguration Frame - {{0, 0}, {603, 32}} + {{0, 0}, {603, 13}} RubberWindowFrame 306 299 810 487 0 0 1440 878 Module PBXNavigatorGroup Proportion - 32pt + 13pt Proportion - 409pt + 428pt Tabs @@ -395,9 +395,7 @@ GeometryConfiguration Frame - {{10, 27}, {603, 382}} - RubberWindowFrame - 306 299 810 487 0 0 1440 878 + {{10, 27}, {603, 401}} Module XCDetailModule @@ -451,7 +449,9 @@ GeometryConfiguration Frame - {{10, 27}, {603, 282}} + {{10, 27}, {603, 401}} + RubberWindowFrame + 306 299 810 487 0 0 1440 878 Module PBXBuildResultsModule @@ -479,11 +479,11 @@ TableOfContents - 8B9D7A7A1F7FAB58007AB60F + 8B793B3521F57A3B006E9731 1CA23ED40692098700951B8B - 8B9D7A7B1F7FAB58007AB60F + 8B793B3621F57A3B006E9731 8B0237581D42B1C400E1E8C8 - 8B9D7A7C1F7FAB58007AB60F + 8B793B3721F57A3B006E9731 1CA23EDF0692099D00951B8B 1CA23EE00692099D00951B8B 1CA23EE10692099D00951B8B @@ -636,7 +636,7 @@ StatusbarIsVisible TimeStamp - 528460632.65863901 + 569735739.28810406 ToolbarConfigUserDefaultsMinorVersion 2 ToolbarDisplayMode @@ -653,7 +653,7 @@ 5 WindowOrderList - 8B9D7A7D1F7FAB58007AB60F + 8B793B3821F57A3B006E9731 /Users/christopherjohnson/Desktop/MacVST/GuitarConditioner/GuitarConditioner.xcodeproj WindowString diff --git a/plugins/MacVST/GuitarConditioner/source/GuitarConditioner.cpp b/plugins/MacVST/GuitarConditioner/source/GuitarConditioner.cpp index 8f3ccfc..b0388ab 100755 --- a/plugins/MacVST/GuitarConditioner/source/GuitarConditioner.cpp +++ b/plugins/MacVST/GuitarConditioner/source/GuitarConditioner.cpp @@ -12,12 +12,9 @@ AudioEffect* createEffectInstance(audioMasterCallback audioMaster) {return new G GuitarConditioner::GuitarConditioner(audioMasterCallback audioMaster) : AudioEffectX(audioMaster, kNumPrograms, kNumParameters) { - fpNShapeLA = 0.0; - fpNShapeLB = 0.0; - fpNShapeRA = 0.0; - fpNShapeRB = 0.0; + fpNShapeL = 0.0; + fpNShapeR = 0.0; fpFlip = true; - lastSampleTL = 0.0; lastSampleBL = 0.0; //for Slews. T for treble, B for bass iirSampleTAL = 0.0; diff --git a/plugins/MacVST/GuitarConditioner/source/GuitarConditioner.h b/plugins/MacVST/GuitarConditioner/source/GuitarConditioner.h index 7bd73ab..3be09e1 100755 --- a/plugins/MacVST/GuitarConditioner/source/GuitarConditioner.h +++ b/plugins/MacVST/GuitarConditioner/source/GuitarConditioner.h @@ -49,13 +49,10 @@ 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 - + bool fpFlip; double lastSampleTL; double lastSampleBL; //for Slews double iirSampleTAL; diff --git a/plugins/MacVST/GuitarConditioner/source/GuitarConditionerProc.cpp b/plugins/MacVST/GuitarConditioner/source/GuitarConditionerProc.cpp index 83970f2..b25d600 100755 --- a/plugins/MacVST/GuitarConditioner/source/GuitarConditionerProc.cpp +++ b/plugins/MacVST/GuitarConditioner/source/GuitarConditionerProc.cpp @@ -17,9 +17,6 @@ void GuitarConditioner::processReplacing(float **inputs, float **outputs, VstInt double overallscale = 1.0; overallscale /= 44100.0; overallscale *= getSampleRate(); - float fpTemp; - long double fpOld = 0.618033988749894848204586; //golden ratio! - long double fpNew = 1.0 - fpOld; long double inputSampleL; long double inputSampleR; @@ -164,26 +161,18 @@ void GuitarConditioner::processReplacing(float **inputs, float **outputs, VstInt lastSampleBR = bassR; //bassR slew inputSampleL = trebleL + bassL; //final merge - inputSampleR = trebleR + bassR; //final merge - //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; - } + inputSampleR = trebleR + bassR; //final merge 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; @@ -205,9 +194,6 @@ void GuitarConditioner::processDoubleReplacing(double **inputs, double **outputs 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; long double inputSampleL; long double inputSampleR; @@ -353,26 +339,19 @@ void GuitarConditioner::processDoubleReplacing(double **inputs, double **outputs lastSampleBR = bassR; //bassR slew inputSampleL = trebleL + bassL; //final merge - inputSampleR = trebleR + bassR; //final merge - //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; - } + inputSampleR = trebleR + bassR; //final merge 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