diff options
author | Chris Johnson <jinx6568@sover.net> | 2019-01-27 21:13:54 -0500 |
---|---|---|
committer | Chris Johnson <jinx6568@sover.net> | 2019-01-27 21:13:54 -0500 |
commit | 966f2d253cd2ee6ce140ad68095a20a9d2b63052 (patch) | |
tree | b0400d95bd06512531ade6ddf55190a58b6a5623 /plugins/MacVST/Aura | |
parent | 0887543349dbbec0721a1fc8b1c7deba9afefa8b (diff) | |
download | airwindows-lv2-port-966f2d253cd2ee6ce140ad68095a20a9d2b63052.tar.gz airwindows-lv2-port-966f2d253cd2ee6ce140ad68095a20a9d2b63052.tar.bz2 airwindows-lv2-port-966f2d253cd2ee6ce140ad68095a20a9d2b63052.zip |
Floating Point Dither For All
Diffstat (limited to 'plugins/MacVST/Aura')
-rwxr-xr-x | plugins/MacVST/Aura/Aura.xcodeproj/christopherjohnson.pbxuser | 26 | ||||
-rwxr-xr-x | plugins/MacVST/Aura/Aura.xcodeproj/christopherjohnson.perspectivev3 | 27 | ||||
-rwxr-xr-x | plugins/MacVST/Aura/source/Aura.cpp | 7 | ||||
-rwxr-xr-x | plugins/MacVST/Aura/source/Aura.h | 7 | ||||
-rwxr-xr-x | plugins/MacVST/Aura/source/AuraProc.cpp | 62 |
5 files changed, 48 insertions, 81 deletions
diff --git a/plugins/MacVST/Aura/Aura.xcodeproj/christopherjohnson.pbxuser b/plugins/MacVST/Aura/Aura.xcodeproj/christopherjohnson.pbxuser index 37c0976..ae8beb8 100755 --- a/plugins/MacVST/Aura/Aura.xcodeproj/christopherjohnson.pbxuser +++ b/plugins/MacVST/Aura/Aura.xcodeproj/christopherjohnson.pbxuser @@ -49,11 +49,11 @@ PBXFileDataSource_Warnings_ColumnID, ); }; - PBXPerProjectTemplateStateSaveDate = 546126715; - PBXWorkspaceStateSaveDate = 546126715; + PBXPerProjectTemplateStateSaveDate = 569718158; + PBXWorkspaceStateSaveDate = 569718158; }; perUserProjectItems = { - 8BC5CC52208D3DCE0058B257 /* PBXTextBookmark */ = 8BC5CC52208D3DCE0058B257 /* PBXTextBookmark */; + 8B7933E421F53595006E9731 /* PBXTextBookmark */ = 8B7933E421F53595006E9731 /* PBXTextBookmark */; 8BC5CEBA208D734A0058B257 /* PBXTextBookmark */ = 8BC5CEBA208D734A0058B257 /* PBXTextBookmark */; }; sourceControlManager = 8B02375E1D42B1C400E1E8C8 /* Source Control */; @@ -86,9 +86,9 @@ }; 24D8286F09A914000093AEF8 /* AuraProc.cpp */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {554, 6305}}"; - sepNavSelRange = "{18235, 0}"; - sepNavVisRange = "{17720, 259}"; + sepNavIntBoundsRect = "{{0, 0}, {621, 5967}}"; + sepNavSelRange = "{17733, 0}"; + sepNavVisRange = "{17681, 52}"; sepNavWindowFrame = "{{7, 47}, {877, 831}}"; }; }; @@ -106,24 +106,24 @@ isa = PBXCodeSenseManager; indexTemplatePath = ""; }; - 8BC5CC52208D3DCE0058B257 /* PBXTextBookmark */ = { + 8B7933E421F53595006E9731 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 24D8286F09A914000093AEF8 /* AuraProc.cpp */; - name = "AuraProc.cpp: 446"; + name = "AuraProc.cpp: 450"; rLen = 0; - rLoc = 14170; + rLoc = 17733; rType = 0; - vrLen = 285; - vrLoc = 17613; + vrLen = 52; + vrLoc = 17681; }; 8BC5CEBA208D734A0058B257 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 24D8286F09A914000093AEF8 /* AuraProc.cpp */; name = "AuraProc.cpp: 475"; rLen = 0; - rLoc = 18235; + rLoc = 17733; rType = 0; - vrLen = 259; + vrLen = 13; vrLoc = 17720; }; 8D01CCC60486CAD60068D4B7 /* Aura */ = { diff --git a/plugins/MacVST/Aura/Aura.xcodeproj/christopherjohnson.perspectivev3 b/plugins/MacVST/Aura/Aura.xcodeproj/christopherjohnson.perspectivev3 index bc4d2cf..7f62a6d 100755 --- a/plugins/MacVST/Aura/Aura.xcodeproj/christopherjohnson.perspectivev3 +++ b/plugins/MacVST/Aura/Aura.xcodeproj/christopherjohnson.perspectivev3 @@ -351,10 +351,10 @@ <key>_historyCapacity</key> <integer>0</integer> <key>bookmark</key> - <string>8BC5CEBA208D734A0058B257</string> + <string>8B7933E421F53595006E9731</string> <key>history</key> <array> - <string>8BC5CC52208D3DCE0058B257</string> + <string>8BC5CEBA208D734A0058B257</string> </array> </dict> <key>SplitCount</key> @@ -368,18 +368,18 @@ <key>GeometryConfiguration</key> <dict> <key>Frame</key> - <string>{{0, 0}, {603, 132}}</string> + <string>{{0, 0}, {603, 117}}</string> <key>RubberWindowFrame</key> <string>36 294 810 487 0 0 1440 878 </string> </dict> <key>Module</key> <string>PBXNavigatorGroup</string> <key>Proportion</key> - <string>132pt</string> + <string>117pt</string> </dict> <dict> <key>Proportion</key> - <string>309pt</string> + <string>324pt</string> <key>Tabs</key> <array> <dict> @@ -393,7 +393,9 @@ <key>GeometryConfiguration</key> <dict> <key>Frame</key> - <string>{{10, 27}, {603, 282}}</string> + <string>{{10, 27}, {603, 297}}</string> + <key>RubberWindowFrame</key> + <string>36 294 810 487 0 0 1440 878 </string> </dict> <key>Module</key> <string>XCDetailModule</string> @@ -448,8 +450,6 @@ <dict> <key>Frame</key> <string>{{10, 27}, {603, 282}}</string> - <key>RubberWindowFrame</key> - <string>36 294 810 487 0 0 1440 878 </string> </dict> <key>Module</key> <string>PBXBuildResultsModule</string> @@ -477,11 +477,11 @@ </array> <key>TableOfContents</key> <array> - <string>8BC5CC5D208D3E220058B257</string> + <string>8B7933E521F53595006E9731</string> <string>1CA23ED40692098700951B8B</string> - <string>8BC5CC5E208D3E220058B257</string> + <string>8B7933E621F53595006E9731</string> <string>8B0237581D42B1C400E1E8C8</string> - <string>8BC5CC5F208D3E220058B257</string> + <string>8B7933E721F53595006E9731</string> <string>1CA23EDF0692099D00951B8B</string> <string>1CA23EE00692099D00951B8B</string> <string>1CA23EE10692099D00951B8B</string> @@ -634,7 +634,7 @@ <key>StatusbarIsVisible</key> <true/> <key>TimeStamp</key> - <real>546141002.76876497</real> + <real>569718165.96792996</real> <key>ToolbarConfigUserDefaultsMinorVersion</key> <string>2</string> <key>ToolbarDisplayMode</key> @@ -651,8 +651,7 @@ <integer>5</integer> <key>WindowOrderList</key> <array> - <string>8BC5CD63208D5C950058B257</string> - <string>/Users/christopherjohnson/Desktop/Aura/Aura.xcodeproj</string> + <string>/Users/christopherjohnson/Desktop/MacVST/Aura/Aura.xcodeproj</string> </array> <key>WindowString</key> <string>36 294 810 487 0 0 1440 878 </string> diff --git a/plugins/MacVST/Aura/source/Aura.cpp b/plugins/MacVST/Aura/source/Aura.cpp index d011564..8663d3b 100755 --- a/plugins/MacVST/Aura/source/Aura.cpp +++ b/plugins/MacVST/Aura/source/Aura.cpp @@ -24,11 +24,8 @@ Aura::Aura(audioMasterCallback audioMaster) : lastSampleR = 0.0; previousVelocityR = 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/Aura/source/Aura.h b/plugins/MacVST/Aura/source/Aura.h index 557169d..22d4653 100755 --- a/plugins/MacVST/Aura/source/Aura.h +++ b/plugins/MacVST/Aura/source/Aura.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 long double lastSampleL; double previousVelocityL; diff --git a/plugins/MacVST/Aura/source/AuraProc.cpp b/plugins/MacVST/Aura/source/AuraProc.cpp index daf54d6..089a873 100755 --- a/plugins/MacVST/Aura/source/AuraProc.cpp +++ b/plugins/MacVST/Aura/source/AuraProc.cpp @@ -14,9 +14,6 @@ void Aura::processReplacing(float **inputs, float **outputs, VstInt32 sampleFram float* out1 = outputs[0]; float* out2 = outputs[1]; - float fpTemp; - long double fpOld = 0.618033988749894848204586; //golden ratio! - long double fpNew = 1.0 - fpOld; double correctionL; double correctionR; @@ -211,25 +208,14 @@ void Aura::processReplacing(float **inputs, float **outputs, VstInt32 sampleFram inputSampleR = (inputSampleR * wet) + (drySampleR * dry); } - //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; @@ -248,9 +234,6 @@ void Aura::processDoubleReplacing(double **inputs, double **outputs, VstInt32 sa double* out1 = outputs[0]; double* out2 = outputs[1]; - double fpTemp; - long double fpOld = 0.618033988749894848204586; //golden ratio! - long double fpNew = 1.0 - fpOld; double correctionL; double correctionR; @@ -445,25 +428,16 @@ void Aura::processDoubleReplacing(double **inputs, double **outputs, VstInt32 sa inputSampleR = (inputSampleR * wet) + (drySampleR * dry); } - //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; |