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 --- .../SurgeTide.xcodeproj/christopherjohnson.pbxuser | 22 ++++---- .../christopherjohnson.perspectivev3 | 30 +++++----- plugins/MacVST/SurgeTide/source/SurgeTide.cpp | 6 +- plugins/MacVST/SurgeTide/source/SurgeTide.h | 6 +- plugins/MacVST/SurgeTide/source/SurgeTideProc.cpp | 66 ++++++---------------- 5 files changed, 48 insertions(+), 82 deletions(-) (limited to 'plugins/MacVST/SurgeTide') diff --git a/plugins/MacVST/SurgeTide/SurgeTide.xcodeproj/christopherjohnson.pbxuser b/plugins/MacVST/SurgeTide/SurgeTide.xcodeproj/christopherjohnson.pbxuser index c98ccc2..4f6f5f0 100755 --- a/plugins/MacVST/SurgeTide/SurgeTide.xcodeproj/christopherjohnson.pbxuser +++ b/plugins/MacVST/SurgeTide/SurgeTide.xcodeproj/christopherjohnson.pbxuser @@ -49,11 +49,11 @@ PBXFileDataSource_Warnings_ColumnID, ); }; - PBXPerProjectTemplateStateSaveDate = 528463581; - PBXWorkspaceStateSaveDate = 528463581; + PBXPerProjectTemplateStateSaveDate = 569772872; + PBXWorkspaceStateSaveDate = 569772872; }; perUserProjectItems = { - 8B9D70D31F7EF8CC007AB60F /* PBXTextBookmark */ = 8B9D70D31F7EF8CC007AB60F /* PBXTextBookmark */; + 8B7940F021F60B71006E9731 /* PBXTextBookmark */ = 8B7940F021F60B71006E9731 /* PBXTextBookmark */; 8B9D7EA31F7FB6EC007AB60F /* PBXTextBookmark */ = 8B9D7EA31F7FB6EC007AB60F /* PBXTextBookmark */; }; sourceControlManager = 8B02375E1D42B1C400E1E8C8 /* Source Control */; @@ -62,23 +62,23 @@ }; 2407DEB6089929BA00EB68BF /* SurgeTide.cpp */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {848, 1846}}"; - sepNavSelRange = "{4583, 0}"; - sepNavVisRange = "{0, 1913}"; + sepNavIntBoundsRect = "{{0, 0}, {848, 1859}}"; + sepNavSelRange = "{517, 0}"; + sepNavVisRange = "{0, 1960}"; sepNavWindowFrame = "{{12, 47}, {895, 831}}"; }; }; 245463B80991757100464AD3 /* SurgeTide.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {866, 949}}"; - sepNavSelRange = "{2633, 0}"; - sepNavVisRange = "{377, 2268}"; + sepNavIntBoundsRect = "{{0, 0}, {866, 923}}"; + sepNavSelRange = "{2465, 0}"; + sepNavVisRange = "{369, 2224}"; sepNavWindowFrame = "{{20, 47}, {895, 831}}"; }; }; 24A2FFDB0F90D1DD003BB5A7 /* audioeffectx.cpp */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {747, 19864}}"; + sepNavIntBoundsRect = "{{0, 0}, {747, 19877}}"; sepNavSelRange = "{10616, 0}"; sepNavVisRange = "{0, 0}"; sepNavWindowFrame = "{{15, 42}, {895, 831}}"; @@ -106,7 +106,7 @@ isa = PBXCodeSenseManager; indexTemplatePath = ""; }; - 8B9D70D31F7EF8CC007AB60F /* PBXTextBookmark */ = { + 8B7940F021F60B71006E9731 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 24A2FFDB0F90D1DD003BB5A7 /* audioeffectx.cpp */; name = "audioeffectx.cpp: 307"; diff --git a/plugins/MacVST/SurgeTide/SurgeTide.xcodeproj/christopherjohnson.perspectivev3 b/plugins/MacVST/SurgeTide/SurgeTide.xcodeproj/christopherjohnson.perspectivev3 index 4c96578..ad29a23 100755 --- a/plugins/MacVST/SurgeTide/SurgeTide.xcodeproj/christopherjohnson.perspectivev3 +++ b/plugins/MacVST/SurgeTide/SurgeTide.xcodeproj/christopherjohnson.perspectivev3 @@ -300,7 +300,7 @@ PBXSmartGroupTreeModuleOutlineStateSelectionKey - 6 + 5 4 0 @@ -351,10 +351,10 @@ _historyCapacity 0 bookmark - 8B9D7EA31F7FB6EC007AB60F + 8B7940F021F60B71006E9731 history - 8B9D70D31F7EF8CC007AB60F + 8B9D7EA31F7FB6EC007AB60F SplitCount @@ -368,18 +368,18 @@ GeometryConfiguration Frame - {{0, 0}, {603, 13}} + {{0, 0}, {603, 0}} RubberWindowFrame 384 385 810 487 0 0 1440 878 Module PBXNavigatorGroup Proportion - 13pt + 0pt Proportion - 428pt + 441pt Tabs @@ -393,9 +393,7 @@ GeometryConfiguration Frame - {{10, 27}, {603, 401}} - RubberWindowFrame - 384 385 810 487 0 0 1440 878 + {{10, 27}, {603, 414}} Module XCDetailModule @@ -449,7 +447,9 @@ GeometryConfiguration Frame - {{10, 27}, {603, 363}} + {{10, 27}, {603, 414}} + RubberWindowFrame + 384 385 810 487 0 0 1440 878 Module PBXBuildResultsModule @@ -477,11 +477,11 @@ TableOfContents - 8B9D7EA41F7FB6EC007AB60F + 8B7940F121F60B71006E9731 1CA23ED40692098700951B8B - 8B9D7EA51F7FB6EC007AB60F + 8B7940F221F60B71006E9731 8B0237581D42B1C400E1E8C8 - 8B9D7EA61F7FB6EC007AB60F + 8B7940F321F60B71006E9731 1CA23EDF0692099D00951B8B 1CA23EE00692099D00951B8B 1CA23EE10692099D00951B8B @@ -634,7 +634,7 @@ StatusbarIsVisible TimeStamp - 528463596.67712098 + 569772913.08327401 ToolbarConfigUserDefaultsMinorVersion 2 ToolbarDisplayMode @@ -651,7 +651,7 @@ 5 WindowOrderList - 8B9D7EA71F7FB6EC007AB60F + 8B7940F421F60B71006E9731 /Users/christopherjohnson/Desktop/MacVST/SurgeTide/SurgeTide.xcodeproj WindowString diff --git a/plugins/MacVST/SurgeTide/source/SurgeTide.cpp b/plugins/MacVST/SurgeTide/source/SurgeTide.cpp index 8df46c0..494e886 100755 --- a/plugins/MacVST/SurgeTide/source/SurgeTide.cpp +++ b/plugins/MacVST/SurgeTide/source/SurgeTide.cpp @@ -15,10 +15,8 @@ SurgeTide::SurgeTide(audioMasterCallback audioMaster) : A = 0.5; B = 0.3; C = 1.0; - fpNShapeAL = 0.0; - fpNShapeBL = 0.0; - fpNShapeAR = 0.0; - fpNShapeBR = 0.0; + fpNShapeL = 0.0; + fpNShapeR = 0.0; flip = true; chaseA = 0.0; chaseB = 0.0; diff --git a/plugins/MacVST/SurgeTide/source/SurgeTide.h b/plugins/MacVST/SurgeTide/source/SurgeTide.h index 27495d7..8f8cd42 100755 --- a/plugins/MacVST/SurgeTide/source/SurgeTide.h +++ b/plugins/MacVST/SurgeTide/source/SurgeTide.h @@ -54,10 +54,8 @@ private: char _programName[kVstMaxProgNameLen + 1]; std::set< std::string > _canDo; - long double fpNShapeAL; - long double fpNShapeBL; - long double fpNShapeAR; - long double fpNShapeBR; + long double fpNShapeL; + long double fpNShapeR; bool flip; long double chaseA; long double chaseB; diff --git a/plugins/MacVST/SurgeTide/source/SurgeTideProc.cpp b/plugins/MacVST/SurgeTide/source/SurgeTideProc.cpp index 2fc6a1a..59a92aa 100755 --- a/plugins/MacVST/SurgeTide/source/SurgeTideProc.cpp +++ b/plugins/MacVST/SurgeTide/source/SurgeTideProc.cpp @@ -17,9 +17,6 @@ void SurgeTide::processReplacing(float **inputs, float **outputs, VstInt32 sampl double overallscale = 1.0; overallscale /= 44100.0; overallscale *= getSampleRate(); - float fpTemp; - long double fpOld = 0.618033988749894848204586; //golden ratio! - long double fpNew = 1.0 - fpOld; long double inputSampleL; long double inputSampleR; @@ -110,27 +107,14 @@ void SurgeTide::processReplacing(float **inputs, float **outputs, VstInt32 sampl inputSampleR = drySampleR - (inputSampleR * intensity); inputSampleR = (drySampleR * dry) + (inputSampleR * wet); - //noise shaping to 32-bit floating point - if (flip) { - fpTemp = inputSampleL; - fpNShapeAL = (fpNShapeAL*fpOld)+((inputSampleL-fpTemp)*fpNew); - inputSampleL += fpNShapeAL; - - fpTemp = inputSampleR; - fpNShapeAR = (fpNShapeAR*fpOld)+((inputSampleR-fpTemp)*fpNew); - inputSampleR += fpNShapeAR; - } - else { - fpTemp = inputSampleL; - fpNShapeBL = (fpNShapeBL*fpOld)+((inputSampleL-fpTemp)*fpNew); - inputSampleL += fpNShapeBL; - - fpTemp = inputSampleR; - fpNShapeBR = (fpNShapeBR*fpOld)+((inputSampleR-fpTemp)*fpNew); - inputSampleR += fpNShapeBR; - } - flip = !flip; - //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; @@ -152,9 +136,6 @@ void SurgeTide::processDoubleReplacing(double **inputs, double **outputs, VstInt double overallscale = 1.0; overallscale /= 44100.0; overallscale *= getSampleRate(); - 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; @@ -245,27 +226,16 @@ void SurgeTide::processDoubleReplacing(double **inputs, double **outputs, VstInt inputSampleR = drySampleR - (inputSampleR * intensity); inputSampleR = (drySampleR * dry) + (inputSampleR * wet); - //noise shaping to 64-bit floating point - if (flip) { - fpTemp = inputSampleL; - fpNShapeAL = (fpNShapeAL*fpOld)+((inputSampleL-fpTemp)*fpNew); - inputSampleL += fpNShapeAL; - - fpTemp = inputSampleR; - fpNShapeAR = (fpNShapeAR*fpOld)+((inputSampleR-fpTemp)*fpNew); - inputSampleR += fpNShapeAR; - } - else { - fpTemp = inputSampleL; - fpNShapeBL = (fpNShapeBL*fpOld)+((inputSampleL-fpTemp)*fpNew); - inputSampleL += fpNShapeBL; - - fpTemp = inputSampleR; - fpNShapeBR = (fpNShapeBR*fpOld)+((inputSampleR-fpTemp)*fpNew); - inputSampleR += fpNShapeBR; - } - flip = !flip; - //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