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 --- .../HermeTrim.xcodeproj/christopherjohnson.pbxuser | 23 ++++---- .../christopherjohnson.perspectivev3 | 28 +++++----- plugins/MacVST/HermeTrim/source/HermeTrim.cpp | 7 +-- plugins/MacVST/HermeTrim/source/HermeTrim.h | 7 +-- plugins/MacVST/HermeTrim/source/HermeTrimProc.cpp | 62 +++++++--------------- 5 files changed, 49 insertions(+), 78 deletions(-) (limited to 'plugins/MacVST/HermeTrim') diff --git a/plugins/MacVST/HermeTrim/HermeTrim.xcodeproj/christopherjohnson.pbxuser b/plugins/MacVST/HermeTrim/HermeTrim.xcodeproj/christopherjohnson.pbxuser index d0644db..1d213fa 100755 --- a/plugins/MacVST/HermeTrim/HermeTrim.xcodeproj/christopherjohnson.pbxuser +++ b/plugins/MacVST/HermeTrim/HermeTrim.xcodeproj/christopherjohnson.pbxuser @@ -49,11 +49,11 @@ PBXFileDataSource_Warnings_ColumnID, ); }; - PBXPerProjectTemplateStateSaveDate = 532471901; - PBXWorkspaceStateSaveDate = 532471901; + PBXPerProjectTemplateStateSaveDate = 569768168; + PBXWorkspaceStateSaveDate = 569768168; }; perUserProjectItems = { - 8BB5DD511FBCE26D008B4570 /* XCBuildMessageTextBookmark */ = 8BB5DD511FBCE26D008B4570 /* XCBuildMessageTextBookmark */; + 8B793B8E21F5F8F6006E9731 /* PBXTextBookmark */ = 8B793B8E21F5F8F6006E9731 /* PBXTextBookmark */; 8BB5DD521FBCE26D008B4570 /* PBXTextBookmark */ = 8BB5DD521FBCE26D008B4570 /* PBXTextBookmark */; }; sourceControlManager = 8B02375E1D42B1C400E1E8C8 /* Source Control */; @@ -78,9 +78,9 @@ }; 24A2FFDB0F90D1DD003BB5A7 /* audioeffectx.cpp */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {838, 19747}}"; + sepNavIntBoundsRect = "{{0, 0}, {838, 19877}}"; sepNavSelRange = "{10616, 0}"; - sepNavVisRange = "{10459, 399}"; + sepNavVisRange = "{10459, 280}"; sepNavWindowFrame = "{{15, 42}, {895, 831}}"; }; }; @@ -106,14 +106,15 @@ isa = PBXCodeSenseManager; indexTemplatePath = ""; }; - 8BB5DD511FBCE26D008B4570 /* XCBuildMessageTextBookmark */ = { + 8B793B8E21F5F8F6006E9731 /* PBXTextBookmark */ = { isa = PBXTextBookmark; - comments = "Deprecated conversion from string constant to 'char*'"; fRef = 24A2FFDB0F90D1DD003BB5A7 /* audioeffectx.cpp */; - fallbackIsa = XCBuildMessageTextBookmark; - rLen = 1; - rLoc = 306; - rType = 1; + name = "audioeffectx.cpp: 307"; + rLen = 0; + rLoc = 10616; + rType = 0; + vrLen = 280; + vrLoc = 10459; }; 8BB5DD521FBCE26D008B4570 /* PBXTextBookmark */ = { isa = PBXTextBookmark; diff --git a/plugins/MacVST/HermeTrim/HermeTrim.xcodeproj/christopherjohnson.perspectivev3 b/plugins/MacVST/HermeTrim/HermeTrim.xcodeproj/christopherjohnson.perspectivev3 index 75862ab..c7b44c4 100755 --- a/plugins/MacVST/HermeTrim/HermeTrim.xcodeproj/christopherjohnson.perspectivev3 +++ b/plugins/MacVST/HermeTrim/HermeTrim.xcodeproj/christopherjohnson.perspectivev3 @@ -256,6 +256,8 @@ Layout + BecomeActive + ContentConfiguration PBXBottomSmartGroupGIDs @@ -349,10 +351,10 @@ _historyCapacity 0 bookmark - 8BB5DD521FBCE26D008B4570 + 8B793B8E21F5F8F6006E9731 history - 8BB5DD511FBCE26D008B4570 + 8BB5DD521FBCE26D008B4570 SplitCount @@ -366,18 +368,18 @@ GeometryConfiguration Frame - {{0, 0}, {603, 132}} + {{0, 0}, {603, 117}} RubberWindowFrame 37 371 810 487 0 0 1440 878 Module PBXNavigatorGroup Proportion - 132pt + 117pt Proportion - 309pt + 324pt Tabs @@ -391,7 +393,9 @@ GeometryConfiguration Frame - {{10, 27}, {603, 414}} + {{10, 27}, {603, 297}} + RubberWindowFrame + 37 371 810 487 0 0 1440 878 Module XCDetailModule @@ -446,8 +450,6 @@ Frame {{10, 27}, {603, 282}} - RubberWindowFrame - 37 371 810 487 0 0 1440 878 Module PBXBuildResultsModule @@ -475,11 +477,11 @@ TableOfContents - 8BB5DD281FBCE0B3008B4570 + 8B793B8F21F5F8F6006E9731 1CA23ED40692098700951B8B - 8BB5DD291FBCE0B3008B4570 + 8B793B9021F5F8F6006E9731 8B0237581D42B1C400E1E8C8 - 8BB5DD2A1FBCE0B3008B4570 + 8B793B9121F5F8F6006E9731 1CA23EDF0692099D00951B8B 1CA23EE00692099D00951B8B 1CA23EE10692099D00951B8B @@ -632,7 +634,7 @@ StatusbarIsVisible TimeStamp - 532472429.63955802 + 569768182.06468904 ToolbarConfigUserDefaultsMinorVersion 2 ToolbarDisplayMode @@ -649,7 +651,7 @@ 5 WindowOrderList - /Users/christopherjohnson/Desktop/HermeTrim/HermeTrim.xcodeproj + /Users/christopherjohnson/Desktop/MacVST/HermeTrim/HermeTrim.xcodeproj WindowString 37 371 810 487 0 0 1440 878 diff --git a/plugins/MacVST/HermeTrim/source/HermeTrim.cpp b/plugins/MacVST/HermeTrim/source/HermeTrim.cpp index 562df2c..117cc45 100755 --- a/plugins/MacVST/HermeTrim/source/HermeTrim.cpp +++ b/plugins/MacVST/HermeTrim/source/HermeTrim.cpp @@ -17,11 +17,8 @@ HermeTrim::HermeTrim(audioMasterCallback audioMaster) : C = 0.5; D = 0.5; E = 0.5; - 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/HermeTrim/source/HermeTrim.h b/plugins/MacVST/HermeTrim/source/HermeTrim.h index b8503ca..f0bc8ed 100755 --- a/plugins/MacVST/HermeTrim/source/HermeTrim.h +++ b/plugins/MacVST/HermeTrim/source/HermeTrim.h @@ -56,11 +56,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/HermeTrim/source/HermeTrimProc.cpp b/plugins/MacVST/HermeTrim/source/HermeTrimProc.cpp index d920843..66d3144 100755 --- a/plugins/MacVST/HermeTrim/source/HermeTrimProc.cpp +++ b/plugins/MacVST/HermeTrim/source/HermeTrimProc.cpp @@ -14,9 +14,6 @@ void HermeTrim::processReplacing(float **inputs, float **outputs, VstInt32 sampl float* out1 = outputs[0]; float* out2 = outputs[1]; - float fpTemp; - long double fpOld = 0.618033988749894848204586; //golden ratio! - long double fpNew = 1.0 - fpOld; double leftgain = pow(10.0,((A*3.0)-1.5)/20.0); double rightgain = pow(10.0,((B*3.0)-1.5)/20.0); @@ -83,25 +80,14 @@ void HermeTrim::processReplacing(float **inputs, float **outputs, VstInt32 sampl inputSampleR = (mid-side) * rightgain; //contains mastergain and the gain trim fixing the mid/side - //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; @@ -120,9 +106,6 @@ void HermeTrim::processDoubleReplacing(double **inputs, double **outputs, VstInt double* out1 = outputs[0]; double* out2 = outputs[1]; - double fpTemp; - long double fpOld = 0.618033988749894848204586; //golden ratio! - long double fpNew = 1.0 - fpOld; double leftgain = pow(10.0,((A*3.0)-1.5)/20.0); double rightgain = pow(10.0,((B*3.0)-1.5)/20.0); @@ -189,25 +172,16 @@ void HermeTrim::processDoubleReplacing(double **inputs, double **outputs, VstInt inputSampleR = (mid-side) * rightgain; //contains mastergain and the gain trim fixing the mid/side - //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