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 --- .../Floor.xcodeproj/christopherjohnson.pbxuser | 16 +++---- .../christopherjohnson.perspectivev3 | 32 ++++++------- plugins/MacVST/Floor/source/FloorProc.cpp | 54 ++++++++-------------- 3 files changed, 41 insertions(+), 61 deletions(-) (limited to 'plugins/MacVST/Floor') diff --git a/plugins/MacVST/Floor/Floor.xcodeproj/christopherjohnson.pbxuser b/plugins/MacVST/Floor/Floor.xcodeproj/christopherjohnson.pbxuser index 612e5ad..80b3123 100755 --- a/plugins/MacVST/Floor/Floor.xcodeproj/christopherjohnson.pbxuser +++ b/plugins/MacVST/Floor/Floor.xcodeproj/christopherjohnson.pbxuser @@ -49,12 +49,12 @@ PBXFileDataSource_Warnings_ColumnID, ); }; - PBXPerProjectTemplateStateSaveDate = 561685582; - PBXWorkspaceStateSaveDate = 561685582; + PBXPerProjectTemplateStateSaveDate = 569735322; + PBXWorkspaceStateSaveDate = 569735322; }; perUserProjectItems = { 8B15DD34217AAF67007AD769 /* PBXTextBookmark */ = 8B15DD34217AAF67007AD769 /* PBXTextBookmark */; - 8B42FCB721604F9E0092969A /* PBXTextBookmark */ = 8B42FCB721604F9E0092969A /* PBXTextBookmark */; + 8B793A6E21F578D2006E9731 /* PBXTextBookmark */ = 8B793A6E21F578D2006E9731 /* PBXTextBookmark */; }; sourceControlManager = 8B02375E1D42B1C400E1E8C8 /* Source Control */; userBuildSettings = { @@ -70,9 +70,9 @@ }; 245463B80991757100464AD3 /* Floor.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {866, 1170}}"; + sepNavIntBoundsRect = "{{0, 0}, {600, 1365}}"; sepNavSelRange = "{0, 0}"; - sepNavVisRange = "{485, 163}"; + sepNavVisRange = "{485, 155}"; sepNavWindowFrame = "{{20, 47}, {895, 831}}"; }; }; @@ -116,15 +116,15 @@ vrLen = 163; vrLoc = 485; }; - 8B42FCB721604F9E0092969A /* PBXTextBookmark */ = { + 8B793A6E21F578D2006E9731 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 245463B80991757100464AD3 /* Floor.h */; name = "Floor.h: 1"; rLen = 0; rLoc = 0; rType = 0; - vrLen = 217; - vrLoc = 459; + vrLen = 155; + vrLoc = 485; }; 8D01CCC60486CAD60068D4B7 /* Floor */ = { activeExec = 0; diff --git a/plugins/MacVST/Floor/Floor.xcodeproj/christopherjohnson.perspectivev3 b/plugins/MacVST/Floor/Floor.xcodeproj/christopherjohnson.perspectivev3 index 853f35f..3af6cc1 100755 --- a/plugins/MacVST/Floor/Floor.xcodeproj/christopherjohnson.perspectivev3 +++ b/plugins/MacVST/Floor/Floor.xcodeproj/christopherjohnson.perspectivev3 @@ -323,7 +323,7 @@ 185 RubberWindowFrame - 21 338 810 487 0 0 1440 878 + 334 313 810 487 0 0 1440 878 Module PBXSmartGroupTreeModule @@ -351,10 +351,10 @@ _historyCapacity 0 bookmark - 8B15DD34217AAF67007AD769 + 8B793A6E21F578D2006E9731 history - 8B42FCB721604F9E0092969A + 8B15DD34217AAF67007AD769 SplitCount @@ -368,18 +368,18 @@ GeometryConfiguration Frame - {{0, 0}, {603, 117}} + {{0, 0}, {603, 102}} RubberWindowFrame - 21 338 810 487 0 0 1440 878 + 334 313 810 487 0 0 1440 878 Module PBXNavigatorGroup Proportion - 117pt + 102pt Proportion - 324pt + 339pt Tabs @@ -393,9 +393,9 @@ GeometryConfiguration Frame - {{10, 27}, {603, 297}} + {{10, 27}, {603, 312}} RubberWindowFrame - 21 338 810 487 0 0 1440 878 + 334 313 810 487 0 0 1440 878 Module XCDetailModule @@ -477,11 +477,11 @@ TableOfContents - 8B15DD35217AAF67007AD769 + 8B793A6F21F578D2006E9731 1CA23ED40692098700951B8B - 8B15DD36217AAF67007AD769 + 8B793A7021F578D2006E9731 8B0237581D42B1C400E1E8C8 - 8B15DD37217AAF67007AD769 + 8B793A7121F578D2006E9731 1CA23EDF0692099D00951B8B 1CA23EE00692099D00951B8B 1CA23EE10692099D00951B8B @@ -634,7 +634,7 @@ StatusbarIsVisible TimeStamp - 561688423.58535099 + 569735378.06358504 ToolbarConfigUserDefaultsMinorVersion 2 ToolbarDisplayMode @@ -651,12 +651,10 @@ 5 WindowOrderList - 8B15DD38217AAF67007AD769 - 8B15DD39217AAF67007AD769 - /Users/christopherjohnson/Desktop/Floor/Floor.xcodeproj + /Users/christopherjohnson/Desktop/MacVST/Floor/Floor.xcodeproj WindowString - 21 338 810 487 0 0 1440 878 + 334 313 810 487 0 0 1440 878 WindowToolsV3 diff --git a/plugins/MacVST/Floor/source/FloorProc.cpp b/plugins/MacVST/Floor/source/FloorProc.cpp index 69a2ccb..865446b 100755 --- a/plugins/MacVST/Floor/source/FloorProc.cpp +++ b/plugins/MacVST/Floor/source/FloorProc.cpp @@ -247,18 +247,14 @@ void Floor::processReplacing(float **inputs, float **outputs, VstInt32 sampleFra 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; @@ -268,12 +264,6 @@ void Floor::processReplacing(float **inputs, float **outputs, VstInt32 sampleFra *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 Floor::processDoubleReplacing(double **inputs, double **outputs, VstInt32 sampleFrames) @@ -516,18 +506,16 @@ void Floor::processDoubleReplacing(double **inputs, double **outputs, VstInt32 s 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; @@ -537,10 +525,4 @@ void Floor::processDoubleReplacing(double **inputs, double **outputs, VstInt32 s *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