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 --- .../PDChannel.xcodeproj/christopherjohnson.pbxuser | 29 +++++----- .../christopherjohnson.perspectivev3 | 28 +++++----- plugins/MacVST/PDChannel/source/PDChannel.cpp | 7 +-- plugins/MacVST/PDChannel/source/PDChannel.h | 7 +-- plugins/MacVST/PDChannel/source/PDChannelProc.cpp | 62 +++++++--------------- 5 files changed, 52 insertions(+), 81 deletions(-) (limited to 'plugins/MacVST/PDChannel') diff --git a/plugins/MacVST/PDChannel/PDChannel.xcodeproj/christopherjohnson.pbxuser b/plugins/MacVST/PDChannel/PDChannel.xcodeproj/christopherjohnson.pbxuser index ed7f54d..80f815a 100755 --- a/plugins/MacVST/PDChannel/PDChannel.xcodeproj/christopherjohnson.pbxuser +++ b/plugins/MacVST/PDChannel/PDChannel.xcodeproj/christopherjohnson.pbxuser @@ -49,13 +49,13 @@ PBXFileDataSource_Warnings_ColumnID, ); }; - PBXPerProjectTemplateStateSaveDate = 538696873; - PBXWorkspaceStateSaveDate = 538696873; + PBXPerProjectTemplateStateSaveDate = 569770782; + PBXWorkspaceStateSaveDate = 569770782; }; perUserProjectItems = { 8B4E574F201BE1E300B5DC2A /* PBXTextBookmark */ = 8B4E574F201BE1E300B5DC2A /* PBXTextBookmark */; - 8B4E5750201BE1E300B5DC2A /* XCBuildMessageTextBookmark */ = 8B4E5750201BE1E300B5DC2A /* XCBuildMessageTextBookmark */; 8B4E5751201BE1E300B5DC2A /* PBXTextBookmark */ = 8B4E5751201BE1E300B5DC2A /* PBXTextBookmark */; + 8B793D9821F60328006E9731 /* PBXTextBookmark */ = 8B793D9821F60328006E9731 /* PBXTextBookmark */; }; sourceControlManager = 8B02375E1D42B1C400E1E8C8 /* Source Control */; userBuildSettings = { @@ -87,9 +87,9 @@ }; 24D8286F09A914000093AEF8 /* PDChannelProc.cpp */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {691, 3705}}"; + sepNavIntBoundsRect = "{{0, 0}, {614, 3341}}"; sepNavSelRange = "{3644, 0}"; - sepNavVisRange = "{3544, 467}"; + sepNavVisRange = "{3529, 442}"; sepNavWindowFrame = "{{42, 47}, {895, 831}}"; }; }; @@ -117,15 +117,6 @@ vrLen = 244; vrLoc = 227; }; - 8B4E5750201BE1E300B5DC2A /* XCBuildMessageTextBookmark */ = { - isa = PBXTextBookmark; - comments = "'previousSampleR' was not declared in this scope"; - fRef = 24D8286F09A914000093AEF8 /* PDChannelProc.cpp */; - fallbackIsa = XCBuildMessageTextBookmark; - rLen = 1; - rLoc = 105; - rType = 1; - }; 8B4E5751201BE1E300B5DC2A /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 24D8286F09A914000093AEF8 /* PDChannelProc.cpp */; @@ -136,6 +127,16 @@ vrLen = 467; vrLoc = 3544; }; + 8B793D9821F60328006E9731 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 24D8286F09A914000093AEF8 /* PDChannelProc.cpp */; + name = "PDChannelProc.cpp: 104"; + rLen = 0; + rLoc = 3644; + rType = 0; + vrLen = 442; + vrLoc = 3529; + }; 8D01CCC60486CAD60068D4B7 /* PDChannel */ = { activeExec = 0; }; diff --git a/plugins/MacVST/PDChannel/PDChannel.xcodeproj/christopherjohnson.perspectivev3 b/plugins/MacVST/PDChannel/PDChannel.xcodeproj/christopherjohnson.perspectivev3 index 524cd88..4ed8256 100755 --- a/plugins/MacVST/PDChannel/PDChannel.xcodeproj/christopherjohnson.perspectivev3 +++ b/plugins/MacVST/PDChannel/PDChannel.xcodeproj/christopherjohnson.perspectivev3 @@ -256,6 +256,8 @@ Layout + BecomeActive + ContentConfiguration PBXBottomSmartGroupGIDs @@ -349,11 +351,11 @@ _historyCapacity 0 bookmark - 8B4E5751201BE1E300B5DC2A + 8B793D9821F60328006E9731 history 8B4E574F201BE1E300B5DC2A - 8B4E5750201BE1E300B5DC2A + 8B4E5751201BE1E300B5DC2A SplitCount @@ -367,18 +369,18 @@ GeometryConfiguration Frame - {{0, 0}, {603, 132}} + {{0, 0}, {603, 117}} RubberWindowFrame 24 89 810 487 0 0 1440 878 Module PBXNavigatorGroup Proportion - 132pt + 117pt Proportion - 309pt + 324pt Tabs @@ -392,7 +394,9 @@ GeometryConfiguration Frame - {{10, 27}, {603, 282}} + {{10, 27}, {603, 297}} + RubberWindowFrame + 24 89 810 487 0 0 1440 878 Module XCDetailModule @@ -447,8 +451,6 @@ Frame {{10, 27}, {603, 282}} - RubberWindowFrame - 24 89 810 487 0 0 1440 878 Module PBXBuildResultsModule @@ -476,11 +478,11 @@ TableOfContents - 8B4E5752201BE1E300B5DC2A + 8B793D9921F60328006E9731 1CA23ED40692098700951B8B - 8B4E5753201BE1E300B5DC2A + 8B793D9A21F60328006E9731 8B0237581D42B1C400E1E8C8 - 8B4E5754201BE1E300B5DC2A + 8B793D9B21F60328006E9731 1CA23EDF0692099D00951B8B 1CA23EE00692099D00951B8B 1CA23EE10692099D00951B8B @@ -633,7 +635,7 @@ StatusbarIsVisible TimeStamp - 538698211.51852405 + 569770792.98222196 ToolbarConfigUserDefaultsMinorVersion 2 ToolbarDisplayMode @@ -650,7 +652,7 @@ 5 WindowOrderList - /Users/christopherjohnson/Desktop/PDChannel/PDChannel.xcodeproj + /Users/christopherjohnson/Desktop/MacVST/PDChannel/PDChannel.xcodeproj WindowString 24 89 810 487 0 0 1440 878 diff --git a/plugins/MacVST/PDChannel/source/PDChannel.cpp b/plugins/MacVST/PDChannel/source/PDChannel.cpp index d300fc8..aef639d 100755 --- a/plugins/MacVST/PDChannel/source/PDChannel.cpp +++ b/plugins/MacVST/PDChannel/source/PDChannel.cpp @@ -21,11 +21,8 @@ PDChannel::PDChannel(audioMasterCallback audioMaster) : previousSampleL = 0.0; previousSampleR = 0.0; - fpNShapeLA = 0.0; - fpNShapeLB = 0.0; - fpNShapeRA = 0.0; - fpNShapeRB = 0.0; - fpFlip = true; + fpNShapeL = 0.0; + fpNShapeR = 0.0; //this is reset: values being initialized only once. Startup values, whatever they are. _canDo.insert("plugAsChannelInsert"); // plug-in can be used as a channel insert effect. diff --git a/plugins/MacVST/PDChannel/source/PDChannel.h b/plugins/MacVST/PDChannel/source/PDChannel.h index e92117c..ea233e2 100755 --- a/plugins/MacVST/PDChannel/source/PDChannel.h +++ b/plugins/MacVST/PDChannel/source/PDChannel.h @@ -53,11 +53,8 @@ private: char _programName[kVstMaxProgNameLen + 1]; std::set< std::string > _canDo; - long double fpNShapeLA; - long double fpNShapeLB; - long double fpNShapeRA; - long double fpNShapeRB; - bool fpFlip; + long double fpNShapeL; + long double fpNShapeR; //default stuff double gainchase; double settingchase; diff --git a/plugins/MacVST/PDChannel/source/PDChannelProc.cpp b/plugins/MacVST/PDChannel/source/PDChannelProc.cpp index d8f79df..fb5932d 100755 --- a/plugins/MacVST/PDChannel/source/PDChannelProc.cpp +++ b/plugins/MacVST/PDChannel/source/PDChannelProc.cpp @@ -13,9 +13,6 @@ void PDChannel::processReplacing(float **inputs, float **outputs, VstInt32 sampl float* in2 = inputs[1]; float* out1 = outputs[0]; float* out2 = outputs[1]; - float fpTemp; - long double fpOld = 0.618033988749894848204586; //golden ratio! - long double fpNew = 1.0 - fpOld; double inputgain = A; double intensity = B; @@ -115,25 +112,14 @@ void PDChannel::processReplacing(float **inputs, float **outputs, VstInt32 sampl previousSampleR = sin(drySampleR); //apply the sine while storing previous sample - //noise shaping to 32-bit floating point - if (fpFlip) { - fpTemp = inputSampleL; - fpNShapeLA = (fpNShapeLA*fpOld)+((inputSampleL-fpTemp)*fpNew); - inputSampleL += fpNShapeLA; - fpTemp = inputSampleR; - fpNShapeRA = (fpNShapeRA*fpOld)+((inputSampleR-fpTemp)*fpNew); - inputSampleR += fpNShapeRA; - } - else { - fpTemp = inputSampleL; - fpNShapeLB = (fpNShapeLB*fpOld)+((inputSampleL-fpTemp)*fpNew); - inputSampleL += fpNShapeLB; - fpTemp = inputSampleR; - fpNShapeRB = (fpNShapeRB*fpOld)+((inputSampleR-fpTemp)*fpNew); - inputSampleR += fpNShapeRB; - } - fpFlip = !fpFlip; - //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; @@ -151,9 +137,6 @@ void PDChannel::processDoubleReplacing(double **inputs, double **outputs, VstInt double* in2 = inputs[1]; double* out1 = outputs[0]; double* out2 = outputs[1]; - double fpTemp; - long double fpOld = 0.618033988749894848204586; //golden ratio! - long double fpNew = 1.0 - fpOld; double inputgain = A; double intensity = B; @@ -253,25 +236,16 @@ void PDChannel::processDoubleReplacing(double **inputs, double **outputs, VstInt previousSampleR = sin(drySampleR); //apply the sine while storing previous sample - //noise shaping to 64-bit floating point - if (fpFlip) { - fpTemp = inputSampleL; - fpNShapeLA = (fpNShapeLA*fpOld)+((inputSampleL-fpTemp)*fpNew); - inputSampleL += fpNShapeLA; - fpTemp = inputSampleR; - fpNShapeRA = (fpNShapeRA*fpOld)+((inputSampleR-fpTemp)*fpNew); - inputSampleR += fpNShapeRA; - } - else { - fpTemp = inputSampleL; - fpNShapeLB = (fpNShapeLB*fpOld)+((inputSampleL-fpTemp)*fpNew); - inputSampleL += fpNShapeLB; - fpTemp = inputSampleR; - fpNShapeRB = (fpNShapeRB*fpOld)+((inputSampleR-fpTemp)*fpNew); - inputSampleR += fpNShapeRB; - } - fpFlip = !fpFlip; - //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