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 | 26 +++++++-- .../christopherjohnson.perspectivev3 | 29 ++++++---- .../MacVST/Console5Buss/source/Console5Buss.cpp | 7 +-- plugins/MacVST/Console5Buss/source/Console5Buss.h | 7 +-- .../Console5Buss/source/Console5BussProc.cpp | 62 +++++++--------------- 5 files changed, 62 insertions(+), 69 deletions(-) (limited to 'plugins/MacVST/Console5Buss') diff --git a/plugins/MacVST/Console5Buss/Console5Buss.xcodeproj/christopherjohnson.pbxuser b/plugins/MacVST/Console5Buss/Console5Buss.xcodeproj/christopherjohnson.pbxuser index e36a6fc..2cc7c8e 100755 --- a/plugins/MacVST/Console5Buss/Console5Buss.xcodeproj/christopherjohnson.pbxuser +++ b/plugins/MacVST/Console5Buss/Console5Buss.xcodeproj/christopherjohnson.pbxuser @@ -49,8 +49,12 @@ PBXFileDataSource_Warnings_ColumnID, ); }; - PBXPerProjectTemplateStateSaveDate = 537052529; - PBXWorkspaceStateSaveDate = 537052529; + PBXPerProjectTemplateStateSaveDate = 569733916; + PBXWorkspaceStateSaveDate = 569733916; + }; + perUserProjectItems = { + 8B79369921F5736A006E9731 /* PBXBookmark */ = 8B79369921F5736A006E9731 /* PBXBookmark */; + 8B79369A21F5736A006E9731 /* PBXTextBookmark */ = 8B79369A21F5736A006E9731 /* PBXTextBookmark */; }; sourceControlManager = 8B02375E1D42B1C400E1E8C8 /* Source Control */; userBuildSettings = { @@ -82,9 +86,9 @@ }; 24D8286F09A914000093AEF8 /* Console5BussProc.cpp */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {848, 4615}}"; + sepNavIntBoundsRect = "{{0, 0}, {712, 4407}}"; sepNavSelRange = "{4031, 0}"; - sepNavVisRange = "{2914, 2017}"; + sepNavVisRange = "{5584, 820}"; sepNavWindowFrame = "{{540, 47}, {895, 831}}"; }; }; @@ -102,6 +106,20 @@ isa = PBXCodeSenseManager; indexTemplatePath = ""; }; + 8B79369921F5736A006E9731 /* PBXBookmark */ = { + isa = PBXBookmark; + fRef = 24D8286F09A914000093AEF8 /* Console5BussProc.cpp */; + }; + 8B79369A21F5736A006E9731 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 24D8286F09A914000093AEF8 /* Console5BussProc.cpp */; + name = "Console5BussProc.cpp: 112"; + rLen = 0; + rLoc = 4031; + rType = 0; + vrLen = 820; + vrLoc = 5584; + }; 8D01CCC60486CAD60068D4B7 /* Console5Buss */ = { activeExec = 0; }; diff --git a/plugins/MacVST/Console5Buss/Console5Buss.xcodeproj/christopherjohnson.perspectivev3 b/plugins/MacVST/Console5Buss/Console5Buss.xcodeproj/christopherjohnson.perspectivev3 index 2fbab9b..6f86a43 100755 --- a/plugins/MacVST/Console5Buss/Console5Buss.xcodeproj/christopherjohnson.perspectivev3 +++ b/plugins/MacVST/Console5Buss/Console5Buss.xcodeproj/christopherjohnson.perspectivev3 @@ -339,7 +339,7 @@ PBXProjectModuleGUID 8B0237581D42B1C400E1E8C8 PBXProjectModuleLabel - Gain.h + Console5BussProc.cpp PBXSplitModuleInNavigatorKey Split0 @@ -347,7 +347,15 @@ PBXProjectModuleGUID 8B0237591D42B1C400E1E8C8 PBXProjectModuleLabel - Gain.h + Console5BussProc.cpp + _historyCapacity + 0 + bookmark + 8B79369A21F5736A006E9731 + history + + 8B79369921F5736A006E9731 + SplitCount 1 @@ -360,18 +368,18 @@ GeometryConfiguration Frame - {{0, 0}, {603, 0}} + {{0, 0}, {603, 358}} RubberWindowFrame 570 328 810 487 0 0 1440 878 Module PBXNavigatorGroup Proportion - 0pt + 358pt Proportion - 441pt + 83pt Tabs @@ -385,7 +393,7 @@ GeometryConfiguration Frame - {{10, 27}, {603, 414}} + {{10, 27}, {603, 56}} RubberWindowFrame 570 328 810 487 0 0 1440 878 @@ -469,11 +477,11 @@ TableOfContents - 8B4D27CB2002C6770051360A + 8B79369B21F5736A006E9731 1CA23ED40692098700951B8B - 8B4D27CC2002C6770051360A + 8B79369C21F5736A006E9731 8B0237581D42B1C400E1E8C8 - 8B4D27CD2002C6770051360A + 8B79369D21F5736A006E9731 1CA23EDF0692099D00951B8B 1CA23EE00692099D00951B8B 1CA23EE10692099D00951B8B @@ -626,7 +634,7 @@ StatusbarIsVisible TimeStamp - 537052791.12328696 + 569733994.75000596 ToolbarConfigUserDefaultsMinorVersion 2 ToolbarDisplayMode @@ -643,7 +651,6 @@ 5 WindowOrderList - 8B4D27CE2002C6770051360A /Users/christopherjohnson/Desktop/MacVST/Console5Buss/Console5Buss.xcodeproj WindowString diff --git a/plugins/MacVST/Console5Buss/source/Console5Buss.cpp b/plugins/MacVST/Console5Buss/source/Console5Buss.cpp index 7f1c915..7e937a8 100755 --- a/plugins/MacVST/Console5Buss/source/Console5Buss.cpp +++ b/plugins/MacVST/Console5Buss/source/Console5Buss.cpp @@ -22,11 +22,8 @@ Console5Buss::Console5Buss(audioMasterCallback audioMaster) : gainchase = -90.0; settingchase = -90.0; chasespeed = 350.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/Console5Buss/source/Console5Buss.h b/plugins/MacVST/Console5Buss/source/Console5Buss.h index 6ece284..0166f33 100755 --- a/plugins/MacVST/Console5Buss/source/Console5Buss.h +++ b/plugins/MacVST/Console5Buss/source/Console5Buss.h @@ -61,11 +61,8 @@ private: double gainchase; double settingchase; double chasespeed; - 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/Console5Buss/source/Console5BussProc.cpp b/plugins/MacVST/Console5Buss/source/Console5BussProc.cpp index 28b4980..21069e8 100755 --- a/plugins/MacVST/Console5Buss/source/Console5BussProc.cpp +++ b/plugins/MacVST/Console5Buss/source/Console5BussProc.cpp @@ -17,9 +17,6 @@ void Console5Buss::processReplacing(float **inputs, float **outputs, VstInt32 sa 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 inputgain = A; double differenceL; @@ -151,25 +148,14 @@ void Console5Buss::processReplacing(float **inputs, float **outputs, VstInt32 sa lastFXBussR *= (1.0 - (nearZeroR * bassTrim)); //this cuts back the DC offset directly, relative to how near zero we are - //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 Console5Buss::processDoubleReplacing(double **inputs, double **outputs, Vst double overallscale = 1.0; overallscale /= 44100.0; overallscale *= getSampleRate(); - double fpTemp; - long double fpOld = 0.618033988749894848204586; //golden ratio! - long double fpNew = 1.0 - fpOld; double inputgain = A; double differenceL; @@ -325,25 +308,16 @@ void Console5Buss::processDoubleReplacing(double **inputs, double **outputs, Vst lastFXBussR *= (1.0 - (nearZeroR * bassTrim)); //this cuts back the DC offset directly, relative to how near zero we are - //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