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 --- .../Distance2.xcodeproj/christopherjohnson.pbxuser | 41 +++++++++------- .../christopherjohnson.perspectivev3 | 32 +++++++------ plugins/MacVST/Distance2/source/Distance2Proc.cpp | 54 ++++++++-------------- 3 files changed, 59 insertions(+), 68 deletions(-) (limited to 'plugins/MacVST/Distance2') diff --git a/plugins/MacVST/Distance2/Distance2.xcodeproj/christopherjohnson.pbxuser b/plugins/MacVST/Distance2/Distance2.xcodeproj/christopherjohnson.pbxuser index 2fb0369..8e41741 100755 --- a/plugins/MacVST/Distance2/Distance2.xcodeproj/christopherjohnson.pbxuser +++ b/plugins/MacVST/Distance2/Distance2.xcodeproj/christopherjohnson.pbxuser @@ -49,12 +49,12 @@ PBXFileDataSource_Warnings_ColumnID, ); }; - PBXPerProjectTemplateStateSaveDate = 547768347; - PBXWorkspaceStateSaveDate = 547768347; + PBXPerProjectTemplateStateSaveDate = 569734535; + PBXWorkspaceStateSaveDate = 569734535; }; perUserProjectItems = { - 8B7E3D4B20A6500200482CB5 /* PBXBookmark */ = 8B7E3D4B20A6500200482CB5 /* PBXBookmark */; - 8B7E3D5420A6501D00482CB5 /* XCBuildMessageTextBookmark */ = 8B7E3D5420A6501D00482CB5 /* XCBuildMessageTextBookmark */; + 8B79383921F57592006E9731 /* PBXTextBookmark */ = 8B79383921F57592006E9731 /* PBXTextBookmark */; + 8B79383D21F57592006E9731 /* PBXTextBookmark */ = 8B79383D21F57592006E9731 /* PBXTextBookmark */; 8B7E3D5520A6501D00482CB5 /* PBXTextBookmark */ = 8B7E3D5520A6501D00482CB5 /* PBXTextBookmark */; 8B7E3D5B20A6501D00482CB5 /* PBXTextBookmark */ = 8B7E3D5B20A6501D00482CB5 /* PBXTextBookmark */; }; @@ -80,15 +80,15 @@ }; 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}}"; }; }; 24D8286F09A914000093AEF8 /* Distance2Proc.cpp */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {848, 7605}}"; + sepNavIntBoundsRect = "{{0, 0}, {848, 7371}}"; sepNavSelRange = "{21129, 0}"; sepNavVisRange = "{8249, 1763}"; sepNavWindowFrame = "{{0, 47}, {895, 831}}"; @@ -108,18 +108,25 @@ isa = PBXCodeSenseManager; indexTemplatePath = ""; }; - 8B7E3D4B20A6500200482CB5 /* PBXBookmark */ = { - isa = PBXBookmark; - fRef = 24D8286F09A914000093AEF8 /* Distance2Proc.cpp */; - }; - 8B7E3D5420A6501D00482CB5 /* XCBuildMessageTextBookmark */ = { + 8B79383921F57592006E9731 /* 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; + }; + 8B79383D21F57592006E9731 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 24D8286F09A914000093AEF8 /* Distance2Proc.cpp */; + name = "Distance2Proc.cpp: 553"; + rLen = 0; + rLoc = 21129; + rType = 0; + vrLen = 1763; + vrLoc = 8249; }; 8B7E3D5520A6501D00482CB5 /* PBXTextBookmark */ = { isa = PBXTextBookmark; diff --git a/plugins/MacVST/Distance2/Distance2.xcodeproj/christopherjohnson.perspectivev3 b/plugins/MacVST/Distance2/Distance2.xcodeproj/christopherjohnson.perspectivev3 index 0268d65..7b0ef13 100755 --- a/plugins/MacVST/Distance2/Distance2.xcodeproj/christopherjohnson.perspectivev3 +++ b/plugins/MacVST/Distance2/Distance2.xcodeproj/christopherjohnson.perspectivev3 @@ -241,10 +241,10 @@ _historyCapacity 0 bookmark - 8B7E3D5B20A6501D00482CB5 + 8B79383D21F57592006E9731 history - 8B7E3D4B20A6500200482CB5 + 8B7E3D5B20A6501D00482CB5 SplitCount @@ -297,6 +297,8 @@ Layout + BecomeActive + ContentConfiguration PBXBottomSmartGroupGIDs @@ -390,10 +392,10 @@ _historyCapacity 0 bookmark - 8B7E3D5520A6501D00482CB5 + 8B79383921F57592006E9731 history - 8B7E3D5420A6501D00482CB5 + 8B7E3D5520A6501D00482CB5 SplitCount @@ -407,18 +409,18 @@ GeometryConfiguration Frame - {{0, 0}, {603, 132}} + {{0, 0}, {603, 117}} RubberWindowFrame 20 288 810 487 0 0 1440 878 Module PBXNavigatorGroup Proportion - 132pt + 117pt Proportion - 309pt + 324pt Tabs @@ -432,7 +434,9 @@ GeometryConfiguration Frame - {{10, 27}, {603, 414}} + {{10, 27}, {603, 297}} + RubberWindowFrame + 20 288 810 487 0 0 1440 878 Module XCDetailModule @@ -487,8 +491,6 @@ Frame {{10, 27}, {603, 282}} - RubberWindowFrame - 20 288 810 487 0 0 1440 878 Module PBXBuildResultsModule @@ -516,11 +518,11 @@ TableOfContents - 8B7E3D5620A6501D00482CB5 + 8B79383A21F57592006E9731 1CA23ED40692098700951B8B - 8B7E3D5720A6501D00482CB5 + 8B79383B21F57592006E9731 8B0237581D42B1C400E1E8C8 - 8B7E3D5820A6501D00482CB5 + 8B79383C21F57592006E9731 1CA23EDF0692099D00951B8B 1CA23EE00692099D00951B8B 1CA23EE10692099D00951B8B @@ -673,7 +675,7 @@ StatusbarIsVisible TimeStamp - 547770397.97323096 + 569734546.43575704 ToolbarConfigUserDefaultsMinorVersion 2 ToolbarDisplayMode @@ -691,7 +693,7 @@ WindowOrderList 8B7E3D5920A6501D00482CB5 - /Users/christopherjohnson/Desktop/Distance2/Distance2.xcodeproj + /Users/christopherjohnson/Desktop/MacVST/Distance2/Distance2.xcodeproj WindowString 20 288 810 487 0 0 1440 878 diff --git a/plugins/MacVST/Distance2/source/Distance2Proc.cpp b/plugins/MacVST/Distance2/source/Distance2Proc.cpp index ef5bf5b..473f3c8 100755 --- a/plugins/MacVST/Distance2/source/Distance2Proc.cpp +++ b/plugins/MacVST/Distance2/source/Distance2Proc.cpp @@ -266,18 +266,14 @@ void Distance2::processReplacing(float **inputs, float **outputs, VstInt32 sampl inputSampleR = (inputSampleR * wet) + (drySampleR * dry); } - //noise shaping to 32-bit floating point - float fpTemp = inputSampleL; - fpNShapeL += (inputSampleL-fpTemp); - inputSampleL += fpNShapeL; - //if this confuses you look at the wordlength for fpTemp :) - fpTemp = inputSampleR; - fpNShapeR += (inputSampleR-fpTemp); - inputSampleR += fpNShapeR; - //for deeper space and warmth, we try a non-oscillating noise shaping - //that is kind of ruthless: it will forever retain the rounding errors - //except we'll dial it back a hair at the end of every buffer processed - //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; @@ -287,12 +283,6 @@ void Distance2::processReplacing(float **inputs, float **outputs, VstInt32 sampl *out1++; *out2++; } - fpNShapeL *= 0.999999; - fpNShapeR *= 0.999999; - //we will just delicately dial back the FP noise shaping, not even every sample - //this is a good place to put subtle 'no runaway' calculations, though bear in mind - //that it will be called more often when you use shorter sample buffers in the DAW. - //So, very low latency operation will call these calculations more often. } void Distance2::processDoubleReplacing(double **inputs, double **outputs, VstInt32 sampleFrames) @@ -554,18 +544,16 @@ void Distance2::processDoubleReplacing(double **inputs, double **outputs, VstInt inputSampleR = (inputSampleR * wet) + (drySampleR * dry); } - //noise shaping to 64-bit floating point - double fpTemp = inputSampleL; - fpNShapeL += (inputSampleL-fpTemp); - inputSampleL += fpNShapeL; - //if this confuses you look at the wordlength for fpTemp :) - fpTemp = inputSampleR; - fpNShapeR += (inputSampleR-fpTemp); - inputSampleR += fpNShapeR; - //for deeper space and warmth, we try a non-oscillating noise shaping - //that is kind of ruthless: it will forever retain the rounding errors - //except we'll dial it back a hair at the end of every buffer processed - //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; @@ -575,10 +563,4 @@ void Distance2::processDoubleReplacing(double **inputs, double **outputs, VstInt *out1++; *out2++; } - fpNShapeL *= 0.999999; - fpNShapeR *= 0.999999; - //we will just delicately dial back the FP noise shaping, not even every sample - //this is a good place to put subtle 'no runaway' calculations, though bear in mind - //that it will be called more often when you use shorter sample buffers in the DAW. - //So, very low latency operation will call these calculations more often. } -- cgit v1.2.3