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 --- .../Ensemble.xcodeproj/christopherjohnson.pbxuser | 37 ++++++------ .../christopherjohnson.perspectivev3 | 37 ++++++------ plugins/MacVST/Ensemble/source/Ensemble.cpp | 7 +-- plugins/MacVST/Ensemble/source/Ensemble.h | 9 +-- plugins/MacVST/Ensemble/source/EnsembleProc.cpp | 66 +++++++--------------- 5 files changed, 64 insertions(+), 92 deletions(-) (limited to 'plugins/MacVST/Ensemble') diff --git a/plugins/MacVST/Ensemble/Ensemble.xcodeproj/christopherjohnson.pbxuser b/plugins/MacVST/Ensemble/Ensemble.xcodeproj/christopherjohnson.pbxuser index 599610a..2c3d879 100755 --- a/plugins/MacVST/Ensemble/Ensemble.xcodeproj/christopherjohnson.pbxuser +++ b/plugins/MacVST/Ensemble/Ensemble.xcodeproj/christopherjohnson.pbxuser @@ -51,12 +51,12 @@ PBXFileDataSource_Warnings_ColumnID, ); }; - PBXPerProjectTemplateStateSaveDate = 529847444; - PBXWorkspaceStateSaveDate = 529847444; + PBXPerProjectTemplateStateSaveDate = 569735122; + PBXWorkspaceStateSaveDate = 569735122; }; perUserProjectItems = { - 8B4C965F1F94E0F300064452 /* XCBuildMessageTextBookmark */ = 8B4C965F1F94E0F300064452 /* XCBuildMessageTextBookmark */; - 8B4C96601F94E0F300064452 /* PBXTextBookmark */ = 8B4C96601F94E0F300064452 /* PBXTextBookmark */; + 8B7939DE21F577D7006E9731 /* PBXTextBookmark */ = 8B7939DE21F577D7006E9731 /* PBXTextBookmark */; + 8B7939ED21F57803006E9731 /* PBXTextBookmark */ = 8B7939ED21F57803006E9731 /* PBXTextBookmark */; }; sourceControlManager = 8B02375E1D42B1C400E1E8C8 /* Source Control */; userBuildSettings = { @@ -64,17 +64,17 @@ }; 2407DEB6089929BA00EB68BF /* Ensemble.cpp */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {628, 2171}}"; + sepNavIntBoundsRect = "{{0, 0}, {628, 2067}}"; sepNavSelRange = "{656, 0}"; - sepNavVisRange = "{485, 184}"; + sepNavVisRange = "{570, 99}"; sepNavWindowFrame = "{{46, 47}, {895, 831}}"; }; }; 245463B80991757100464AD3 /* Ensemble.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {866, 1118}}"; - sepNavSelRange = "{2554, 0}"; - sepNavVisRange = "{624, 2262}"; + sepNavIntBoundsRect = "{{0, 0}, {866, 1079}}"; + sepNavSelRange = "{2770, 0}"; + sepNavVisRange = "{538, 2294}"; sepNavWindowFrame = "{{505, 39}, {895, 831}}"; }; }; @@ -108,24 +108,25 @@ isa = PBXCodeSenseManager; indexTemplatePath = ""; }; - 8B4C965F1F94E0F300064452 /* XCBuildMessageTextBookmark */ = { + 8B7939DE21F577D7006E9731 /* PBXTextBookmark */ = { isa = PBXTextBookmark; - comments = "Incompatible types in assignment of 'double' to 'double [49]'"; fRef = 2407DEB6089929BA00EB68BF /* Ensemble.cpp */; - fallbackIsa = XCBuildMessageTextBookmark; - rLen = 1; - rLoc = 21; - rType = 1; + name = "Ensemble.cpp: 22"; + rLen = 0; + rLoc = 656; + rType = 0; + vrLen = 99; + vrLoc = 570; }; - 8B4C96601F94E0F300064452 /* PBXTextBookmark */ = { + 8B7939ED21F57803006E9731 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 2407DEB6089929BA00EB68BF /* Ensemble.cpp */; name = "Ensemble.cpp: 22"; rLen = 0; rLoc = 656; rType = 0; - vrLen = 184; - vrLoc = 485; + vrLen = 99; + vrLoc = 570; }; 8D01CCC60486CAD60068D4B7 /* Ensemble */ = { activeExec = 0; diff --git a/plugins/MacVST/Ensemble/Ensemble.xcodeproj/christopherjohnson.perspectivev3 b/plugins/MacVST/Ensemble/Ensemble.xcodeproj/christopherjohnson.perspectivev3 index 6da0cef..3188f6d 100755 --- a/plugins/MacVST/Ensemble/Ensemble.xcodeproj/christopherjohnson.perspectivev3 +++ b/plugins/MacVST/Ensemble/Ensemble.xcodeproj/christopherjohnson.perspectivev3 @@ -256,6 +256,8 @@ Layout + BecomeActive + ContentConfiguration PBXBottomSmartGroupGIDs @@ -298,7 +300,7 @@ PBXSmartGroupTreeModuleOutlineStateSelectionKey - 7 + 5 4 0 @@ -321,7 +323,7 @@ 185 RubberWindowFrame - 13 367 810 487 0 0 1440 878 + 348 289 810 487 0 0 1440 878 Module PBXSmartGroupTreeModule @@ -349,10 +351,10 @@ _historyCapacity 0 bookmark - 8B4C96601F94E0F300064452 + 8B7939ED21F57803006E9731 history - 8B4C965F1F94E0F300064452 + 8B7939DE21F577D7006E9731 SplitCount @@ -366,18 +368,18 @@ GeometryConfiguration Frame - {{0, 0}, {603, 69}} + {{0, 0}, {603, 51}} RubberWindowFrame - 13 367 810 487 0 0 1440 878 + 348 289 810 487 0 0 1440 878 Module PBXNavigatorGroup Proportion - 69pt + 51pt Proportion - 372pt + 390pt Tabs @@ -391,7 +393,7 @@ GeometryConfiguration Frame - {{10, 27}, {603, 345}} + {{10, 27}, {603, 363}} Module XCDetailModule @@ -445,9 +447,9 @@ GeometryConfiguration Frame - {{10, 27}, {603, 345}} + {{10, 27}, {603, 363}} RubberWindowFrame - 13 367 810 487 0 0 1440 878 + 348 289 810 487 0 0 1440 878 Module PBXBuildResultsModule @@ -475,11 +477,11 @@ TableOfContents - 8B4C96611F94E0F300064452 + 8B7939EE21F57803006E9731 1CA23ED40692098700951B8B - 8B4C96621F94E0F300064452 + 8B7939EF21F57803006E9731 8B0237581D42B1C400E1E8C8 - 8B4C96631F94E0F300064452 + 8B7939F021F57803006E9731 1CA23EDF0692099D00951B8B 1CA23EE00692099D00951B8B 1CA23EE10692099D00951B8B @@ -652,7 +654,7 @@ StatusbarIsVisible TimeStamp - 529850611.29679602 + 569735171.20292497 ToolbarConfigUserDefaultsMinorVersion 2 ToolbarDisplayMode @@ -669,11 +671,10 @@ 5 WindowOrderList - 8B4C96641F94E0F300064452 - /Users/christopherjohnson/Desktop/Ensemble/Ensemble.xcodeproj + /Users/christopherjohnson/Desktop/MacVST/Ensemble/Ensemble.xcodeproj WindowString - 13 367 810 487 0 0 1440 878 + 348 289 810 487 0 0 1440 878 WindowToolsV3 diff --git a/plugins/MacVST/Ensemble/source/Ensemble.cpp b/plugins/MacVST/Ensemble/source/Ensemble.cpp index be624b2..b90bf6e 100755 --- a/plugins/MacVST/Ensemble/source/Ensemble.cpp +++ b/plugins/MacVST/Ensemble/source/Ensemble.cpp @@ -28,12 +28,9 @@ Ensemble::Ensemble(audioMasterCallback audioMaster) : airEvenR = 0.0; airOddR = 0.0; airFactorR = 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/Ensemble/source/Ensemble.h b/plugins/MacVST/Ensemble/source/Ensemble.h index 32ba8c0..7697d93 100755 --- a/plugins/MacVST/Ensemble/source/Ensemble.h +++ b/plugins/MacVST/Ensemble/source/Ensemble.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 const static int totalsamples = 65540; float dL[totalsamples]; @@ -74,7 +71,7 @@ private: double airEvenR; double airOddR; double airFactorR; - + bool fpFlip; float A; float B; float C; diff --git a/plugins/MacVST/Ensemble/source/EnsembleProc.cpp b/plugins/MacVST/Ensemble/source/EnsembleProc.cpp index 679e868..e9a3a43 100755 --- a/plugins/MacVST/Ensemble/source/EnsembleProc.cpp +++ b/plugins/MacVST/Ensemble/source/EnsembleProc.cpp @@ -37,9 +37,6 @@ void Ensemble::processReplacing(float **inputs, float **outputs, VstInt32 sample double tempL; double tempR; - float fpTemp; - long double fpOld = 0.618033988749894848204586; //golden ratio! - long double fpNew = 1.0 - fpOld; long double inputSampleL; long double inputSampleR; @@ -117,7 +114,8 @@ void Ensemble::processReplacing(float **inputs, float **outputs, VstInt32 sample airPrevR = inputSampleR; inputSampleR += (airFactorR*brighten); //air, compensates for loss of highs in flanger's interpolation - + fpFlip = !fpFlip; + if (gcount < 1 || gcount > 32767) {gcount = 32767;} count = gcount; dL[count+32767] = dL[count] = tempL = inputSampleL; @@ -155,25 +153,14 @@ void Ensemble::processReplacing(float **inputs, float **outputs, VstInt32 sample inputSampleR = (inputSampleR * wet) + (drySampleR * dry); } - //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; @@ -215,9 +202,6 @@ void Ensemble::processDoubleReplacing(double **inputs, double **outputs, VstInt3 double tempL; double tempR; - 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; @@ -295,6 +279,7 @@ void Ensemble::processDoubleReplacing(double **inputs, double **outputs, VstInt3 airPrevR = inputSampleR; inputSampleR += (airFactorR*brighten); //air, compensates for loss of highs in flanger's interpolation + fpFlip = !fpFlip; if (gcount < 1 || gcount > 32767) {gcount = 32767;} count = gcount; @@ -333,25 +318,16 @@ void Ensemble::processDoubleReplacing(double **inputs, double **outputs, VstInt3 inputSampleR = (inputSampleR * wet) + (drySampleR * dry); } - //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