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 | 43 ++++-------- .../christopherjohnson.perspectivev3 | 77 ++++++---------------- .../source/SingleEndedTriodeProc.cpp | 54 +++++---------- 3 files changed, 51 insertions(+), 123 deletions(-) (limited to 'plugins/MacVST/SingleEndedTriode') diff --git a/plugins/MacVST/SingleEndedTriode/SingleEndedTriode.xcodeproj/christopherjohnson.pbxuser b/plugins/MacVST/SingleEndedTriode/SingleEndedTriode.xcodeproj/christopherjohnson.pbxuser index 666e6a8..76b994a 100755 --- a/plugins/MacVST/SingleEndedTriode/SingleEndedTriode.xcodeproj/christopherjohnson.pbxuser +++ b/plugins/MacVST/SingleEndedTriode/SingleEndedTriode.xcodeproj/christopherjohnson.pbxuser @@ -49,14 +49,12 @@ PBXFileDataSource_Warnings_ColumnID, ); }; - PBXPerProjectTemplateStateSaveDate = 547786592; - PBXWorkspaceStateSaveDate = 547786592; + PBXPerProjectTemplateStateSaveDate = 569771858; + PBXWorkspaceStateSaveDate = 569771858; }; perUserProjectItems = { - 8B7E3E7A20A690EE00482CB5 /* PBXBookmark */ = 8B7E3E7A20A690EE00482CB5 /* PBXBookmark */; - 8B7E3E8320A6930B00482CB5 /* XCBuildMessageTextBookmark */ = 8B7E3E8320A6930B00482CB5 /* XCBuildMessageTextBookmark */; + 8B793FA121F60766006E9731 /* PBXTextBookmark */ = 8B793FA121F60766006E9731 /* PBXTextBookmark */; 8B7E3E8420A6930B00482CB5 /* PBXTextBookmark */ = 8B7E3E8420A6930B00482CB5 /* PBXTextBookmark */; - 8B7E3E8720A6930B00482CB5 /* PBXTextBookmark */ = 8B7E3E8720A6930B00482CB5 /* PBXTextBookmark */; }; sourceControlManager = 8B02375E1D42B1C400E1E8C8 /* Source Control */; userBuildSettings = { @@ -80,17 +78,17 @@ }; 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 /* SingleEndedTriodeProc.cpp */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {848, 3978}}"; + sepNavIntBoundsRect = "{{0, 0}, {848, 3744}}"; sepNavSelRange = "{10510, 0}"; - sepNavVisRange = "{1431, 2096}"; + sepNavVisRange = "{3404, 1933}"; sepNavWindowFrame = "{{26, 47}, {895, 831}}"; }; }; @@ -108,18 +106,15 @@ isa = PBXCodeSenseManager; indexTemplatePath = ""; }; - 8B7E3E7A20A690EE00482CB5 /* PBXBookmark */ = { - isa = PBXBookmark; - fRef = 24D8286F09A914000093AEF8 /* SingleEndedTriodeProc.cpp */; - }; - 8B7E3E8320A6930B00482CB5 /* XCBuildMessageTextBookmark */ = { + 8B793FA121F60766006E9731 /* 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; }; 8B7E3E8420A6930B00482CB5 /* PBXTextBookmark */ = { isa = PBXTextBookmark; @@ -131,16 +126,6 @@ vrLen = 399; vrLoc = 10459; }; - 8B7E3E8720A6930B00482CB5 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 24D8286F09A914000093AEF8 /* SingleEndedTriodeProc.cpp */; - name = "SingleEndedTriodeProc.cpp: 279"; - rLen = 0; - rLoc = 10510; - rType = 0; - vrLen = 2096; - vrLoc = 1431; - }; 8D01CCC60486CAD60068D4B7 /* SingleEndedTriode */ = { activeExec = 0; }; diff --git a/plugins/MacVST/SingleEndedTriode/SingleEndedTriode.xcodeproj/christopherjohnson.perspectivev3 b/plugins/MacVST/SingleEndedTriode/SingleEndedTriode.xcodeproj/christopherjohnson.perspectivev3 index 7b7baa9..8ba4686 100755 --- a/plugins/MacVST/SingleEndedTriode/SingleEndedTriode.xcodeproj/christopherjohnson.perspectivev3 +++ b/plugins/MacVST/SingleEndedTriode/SingleEndedTriode.xcodeproj/christopherjohnson.perspectivev3 @@ -222,48 +222,7 @@ OpenEditors - - - Content - - PBXProjectModuleGUID - 8B7E3E8520A6930B00482CB5 - PBXProjectModuleLabel - SingleEndedTriodeProc.cpp - PBXSplitModuleInNavigatorKey - - Split0 - - PBXProjectModuleGUID - 8B7E3E8620A6930B00482CB5 - PBXProjectModuleLabel - SingleEndedTriodeProc.cpp - _historyCapacity - 0 - bookmark - 8B7E3E8720A6930B00482CB5 - history - - 8B7E3E7A20A690EE00482CB5 - - - SplitCount - 1 - - StatusBarVisibility - - - Geometry - - Frame - {{0, 20}, {895, 734}} - PBXModuleWindowStatusBarHidden2 - - RubberWindowFrame - 26 103 895 775 0 0 1440 878 - - - + PerspectiveWidths 810 @@ -297,6 +256,8 @@ Layout + BecomeActive + ContentConfiguration PBXBottomSmartGroupGIDs @@ -362,7 +323,7 @@ 185 RubberWindowFrame - 27 292 810 487 0 0 1440 878 + 143 323 810 487 0 0 1440 878 Module PBXSmartGroupTreeModule @@ -390,10 +351,10 @@ _historyCapacity 0 bookmark - 8B7E3E8420A6930B00482CB5 + 8B793FA121F60766006E9731 history - 8B7E3E8320A6930B00482CB5 + 8B7E3E8420A6930B00482CB5 SplitCount @@ -407,18 +368,18 @@ GeometryConfiguration Frame - {{0, 0}, {603, 132}} + {{0, 0}, {603, 117}} RubberWindowFrame - 27 292 810 487 0 0 1440 878 + 143 323 810 487 0 0 1440 878 Module PBXNavigatorGroup Proportion - 132pt + 117pt Proportion - 309pt + 324pt Tabs @@ -432,7 +393,9 @@ GeometryConfiguration Frame - {{10, 27}, {603, 414}} + {{10, 27}, {603, 297}} + RubberWindowFrame + 143 323 810 487 0 0 1440 878 Module XCDetailModule @@ -487,8 +450,6 @@ Frame {{10, 27}, {603, 282}} - RubberWindowFrame - 27 292 810 487 0 0 1440 878 Module PBXBuildResultsModule @@ -516,11 +477,11 @@ TableOfContents - 8B7E3E5D20A68F7800482CB5 + 8B793FA221F60766006E9731 1CA23ED40692098700951B8B - 8B7E3E5E20A68F7800482CB5 + 8B793FA321F60766006E9731 8B0237581D42B1C400E1E8C8 - 8B7E3E5F20A68F7800482CB5 + 8B793FA421F60766006E9731 1CA23EDF0692099D00951B8B 1CA23EE00692099D00951B8B 1CA23EE10692099D00951B8B @@ -673,7 +634,7 @@ StatusbarIsVisible TimeStamp - 547787531.91072297 + 569771878.44873595 ToolbarConfigUserDefaultsMinorVersion 2 ToolbarDisplayMode @@ -691,10 +652,10 @@ WindowOrderList 8B7E3E8520A6930B00482CB5 - /Users/christopherjohnson/Desktop/SingleEndedTriode/SingleEndedTriode.xcodeproj + /Users/christopherjohnson/Desktop/MacVST/SingleEndedTriode/SingleEndedTriode.xcodeproj WindowString - 27 292 810 487 0 0 1440 878 + 143 323 810 487 0 0 1440 878 WindowToolsV3 diff --git a/plugins/MacVST/SingleEndedTriode/source/SingleEndedTriodeProc.cpp b/plugins/MacVST/SingleEndedTriode/source/SingleEndedTriodeProc.cpp index 5781165..ef6694c 100755 --- a/plugins/MacVST/SingleEndedTriode/source/SingleEndedTriodeProc.cpp +++ b/plugins/MacVST/SingleEndedTriode/source/SingleEndedTriodeProc.cpp @@ -127,18 +127,14 @@ void SingleEndedTriode::processReplacing(float **inputs, float **outputs, VstInt 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; @@ -148,12 +144,6 @@ void SingleEndedTriode::processReplacing(float **inputs, float **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. } void SingleEndedTriode::processDoubleReplacing(double **inputs, double **outputs, VstInt32 sampleFrames) @@ -276,18 +266,16 @@ void SingleEndedTriode::processDoubleReplacing(double **inputs, double **outputs 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; @@ -297,10 +285,4 @@ void SingleEndedTriode::processDoubleReplacing(double **inputs, double **outputs *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. } \ No newline at end of file -- cgit v1.2.3