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 --- .../Thunder.xcodeproj/christopherjohnson.pbxuser | 35 ++++-------- .../christopherjohnson.perspectivev3 | 30 +++++----- plugins/MacVST/Thunder/source/Thunder.cpp | 6 +- plugins/MacVST/Thunder/source/Thunder.h | 6 +- plugins/MacVST/Thunder/source/ThunderProc.cpp | 66 ++++++---------------- 5 files changed, 48 insertions(+), 95 deletions(-) (limited to 'plugins/MacVST/Thunder') diff --git a/plugins/MacVST/Thunder/Thunder.xcodeproj/christopherjohnson.pbxuser b/plugins/MacVST/Thunder/Thunder.xcodeproj/christopherjohnson.pbxuser index 79ebcf3..15ab8ae 100755 --- a/plugins/MacVST/Thunder/Thunder.xcodeproj/christopherjohnson.pbxuser +++ b/plugins/MacVST/Thunder/Thunder.xcodeproj/christopherjohnson.pbxuser @@ -49,13 +49,12 @@ PBXFileDataSource_Warnings_ColumnID, ); }; - PBXPerProjectTemplateStateSaveDate = 528463664; - PBXWorkspaceStateSaveDate = 528463664; + PBXPerProjectTemplateStateSaveDate = 569773085; + PBXWorkspaceStateSaveDate = 569773085; }; perUserProjectItems = { - 8B9D712F1F7EF94F007AB60F /* PBXTextBookmark */ = 8B9D712F1F7EF94F007AB60F /* PBXTextBookmark */; + 8B79419321F60C4C006E9731 /* PBXTextBookmark */ = 8B79419321F60C4C006E9731 /* PBXTextBookmark */; 8B9D7F011F7FB742007AB60F /* PBXTextBookmark */ = 8B9D7F011F7FB742007AB60F /* PBXTextBookmark */; - 8BFE4BF31D92E5D600BBC6AC /* PBXTextBookmark */ = 8BFE4BF31D92E5D600BBC6AC /* PBXTextBookmark */; }; sourceControlManager = 8B02375E1D42B1C400E1E8C8 /* Source Control */; userBuildSettings = { @@ -63,17 +62,17 @@ }; 2407DEB6089929BA00EB68BF /* Thunder.cpp */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {848, 1898}}"; - sepNavSelRange = "{639, 0}"; - sepNavVisRange = "{2907, 2125}"; + sepNavIntBoundsRect = "{{0, 0}, {848, 1937}}"; + sepNavSelRange = "{494, 0}"; + sepNavVisRange = "{0, 1878}"; sepNavWindowFrame = "{{542, 47}, {895, 831}}"; }; }; 245463B80991757100464AD3 /* Thunder.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {866, 1092}}"; - sepNavSelRange = "{2556, 0}"; - sepNavVisRange = "{609, 2247}"; + sepNavIntBoundsRect = "{{0, 0}, {866, 1066}}"; + sepNavSelRange = "{2752, 0}"; + sepNavVisRange = "{591, 2213}"; sepNavWindowFrame = "{{545, 47}, {895, 831}}"; }; }; @@ -87,7 +86,7 @@ }; 24D8286F09A914000093AEF8 /* ThunderProc.cpp */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {554, 6630}}"; + sepNavIntBoundsRect = "{{0, 0}, {554, 6240}}"; sepNavSelRange = "{1105, 0}"; sepNavVisRange = "{0, 0}"; sepNavWindowFrame = "{{545, 47}, {895, 831}}"; @@ -107,10 +106,10 @@ isa = PBXCodeSenseManager; indexTemplatePath = ""; }; - 8B9D712F1F7EF94F007AB60F /* PBXTextBookmark */ = { + 8B79419321F60C4C006E9731 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 24D8286F09A914000093AEF8 /* ThunderProc.cpp */; - name = "ThunderProc.cpp: 44"; + name = "ThunderProc.cpp: 43"; rLen = 0; rLoc = 1105; rType = 0; @@ -127,16 +126,6 @@ vrLen = 0; vrLoc = 0; }; - 8BFE4BF31D92E5D600BBC6AC /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 245463B80991757100464AD3 /* Thunder.h */; - name = "Thunder.h: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 101; - vrLoc = 0; - }; 8D01CCC60486CAD60068D4B7 /* Thunder */ = { activeExec = 0; }; diff --git a/plugins/MacVST/Thunder/Thunder.xcodeproj/christopherjohnson.perspectivev3 b/plugins/MacVST/Thunder/Thunder.xcodeproj/christopherjohnson.perspectivev3 index 72d0e9f..b395b32 100755 --- a/plugins/MacVST/Thunder/Thunder.xcodeproj/christopherjohnson.perspectivev3 +++ b/plugins/MacVST/Thunder/Thunder.xcodeproj/christopherjohnson.perspectivev3 @@ -300,7 +300,7 @@ PBXSmartGroupTreeModuleOutlineStateSelectionKey - 6 + 5 4 0 @@ -351,11 +351,10 @@ _historyCapacity 0 bookmark - 8B9D7F011F7FB742007AB60F + 8B79419321F60C4C006E9731 history - 8BFE4BF31D92E5D600BBC6AC - 8B9D712F1F7EF94F007AB60F + 8B9D7F011F7FB742007AB60F SplitCount @@ -369,18 +368,18 @@ GeometryConfiguration Frame - {{0, 0}, {603, 13}} + {{0, 0}, {603, 0}} RubberWindowFrame 459 303 810 487 0 0 1440 878 Module PBXNavigatorGroup Proportion - 13pt + 0pt Proportion - 428pt + 441pt Tabs @@ -394,9 +393,7 @@ GeometryConfiguration Frame - {{10, 27}, {603, 401}} - RubberWindowFrame - 459 303 810 487 0 0 1440 878 + {{10, 27}, {603, 414}} Module XCDetailModule @@ -450,7 +447,9 @@ GeometryConfiguration Frame - {{10, 27}, {603, 345}} + {{10, 27}, {603, 414}} + RubberWindowFrame + 459 303 810 487 0 0 1440 878 Module PBXBuildResultsModule @@ -478,11 +477,11 @@ TableOfContents - 8B9D7F021F7FB742007AB60F + 8B79419421F60C4C006E9731 1CA23ED40692098700951B8B - 8B9D7F031F7FB742007AB60F + 8B79419521F60C4C006E9731 8B0237581D42B1C400E1E8C8 - 8B9D7F041F7FB742007AB60F + 8B79419621F60C4C006E9731 1CA23EDF0692099D00951B8B 1CA23EE00692099D00951B8B 1CA23EE10692099D00951B8B @@ -635,7 +634,7 @@ StatusbarIsVisible TimeStamp - 528463682.24477601 + 569773132.16742396 ToolbarConfigUserDefaultsMinorVersion 2 ToolbarDisplayMode @@ -652,7 +651,6 @@ 5 WindowOrderList - 8B9D7F051F7FB742007AB60F /Users/christopherjohnson/Desktop/MacVST/Thunder/Thunder.xcodeproj WindowString diff --git a/plugins/MacVST/Thunder/source/Thunder.cpp b/plugins/MacVST/Thunder/source/Thunder.cpp index 015eabd..7bc8226 100755 --- a/plugins/MacVST/Thunder/source/Thunder.cpp +++ b/plugins/MacVST/Thunder/source/Thunder.cpp @@ -15,10 +15,8 @@ Thunder::Thunder(audioMasterCallback audioMaster) : A = 0.0; B = 1.0; - fpNShapeAL = 0.0; - fpNShapeBL = 0.0; - fpNShapeAR = 0.0; - fpNShapeBR = 0.0; + fpNShapeL = 0.0; + fpNShapeR = 0.0; muSpeedA = 10000; muSpeedB = 10000; muCoefficientA = 1; diff --git a/plugins/MacVST/Thunder/source/Thunder.h b/plugins/MacVST/Thunder/source/Thunder.h index 1ef1d03..9e49054 100755 --- a/plugins/MacVST/Thunder/source/Thunder.h +++ b/plugins/MacVST/Thunder/source/Thunder.h @@ -69,10 +69,8 @@ private: double iirSampleAM; double iirSampleBM; double iirSampleCM; - long double fpNShapeAL; - long double fpNShapeBL; - long double fpNShapeAR; - long double fpNShapeBR; + long double fpNShapeL; + long double fpNShapeR; bool flip; float A; diff --git a/plugins/MacVST/Thunder/source/ThunderProc.cpp b/plugins/MacVST/Thunder/source/ThunderProc.cpp index bd401d4..2cf454d 100755 --- a/plugins/MacVST/Thunder/source/ThunderProc.cpp +++ b/plugins/MacVST/Thunder/source/ThunderProc.cpp @@ -40,9 +40,6 @@ void Thunder::processReplacing(float **inputs, float **outputs, VstInt32 sampleF double resultML; double resultMR; - float fpTemp; - double fpOld = 0.618033988749894848204586; //golden ratio! - double fpNew = 1.0 - fpOld; long double inputSampleL; long double inputSampleR; @@ -225,27 +222,14 @@ void Thunder::processReplacing(float **inputs, float **outputs, VstInt32 sampleF inputSampleR *= outputGain; } - //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; @@ -291,9 +275,6 @@ void Thunder::processDoubleReplacing(double **inputs, double **outputs, VstInt32 double resultML; double resultMR; - double fpTemp; - double fpOld = 0.618033988749894848204586; //golden ratio! - double fpNew = 1.0 - fpOld; long double inputSampleL; long double inputSampleR; @@ -476,27 +457,16 @@ void Thunder::processDoubleReplacing(double **inputs, double **outputs, VstInt32 inputSampleR *= outputGain; } - //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 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; -- cgit v1.2.3