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/ToTape5 | |
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/ToTape5')
5 files changed, 54 insertions, 89 deletions
diff --git a/plugins/MacVST/ToTape5/ToTape5.xcodeproj/christopherjohnson.pbxuser b/plugins/MacVST/ToTape5/ToTape5.xcodeproj/christopherjohnson.pbxuser index 6d067c0..6f55ad4 100755 --- a/plugins/MacVST/ToTape5/ToTape5.xcodeproj/christopherjohnson.pbxuser +++ b/plugins/MacVST/ToTape5/ToTape5.xcodeproj/christopherjohnson.pbxuser @@ -49,15 +49,15 @@ PBXFileDataSource_Warnings_ColumnID, ); }; - PBXPerProjectTemplateStateSaveDate = 528463719; - PBXWorkspaceStateSaveDate = 528463719; + PBXPerProjectTemplateStateSaveDate = 569773171; + PBXWorkspaceStateSaveDate = 569773171; }; perUserProjectItems = { 8B1A33851F16D336004DE6C5 /* PBXTextBookmark */ = 8B1A33851F16D336004DE6C5 /* PBXTextBookmark */; 8B1A33A71F16D5B5004DE6C5 /* PBXTextBookmark */ = 8B1A33A71F16D5B5004DE6C5 /* PBXTextBookmark */; 8B4846EC1F6D3E64007BD0D0 /* PBXTextBookmark */ = 8B4846EC1F6D3E64007BD0D0 /* PBXTextBookmark */; - 8B9D716F1F7EFA45007AB60F /* PBXTextBookmark */ = 8B9D716F1F7EFA45007AB60F /* PBXTextBookmark */; - 8B9D7F411F7FB77C007AB60F /* PBXTextBookmark */ = 8B9D7F411F7FB77C007AB60F /* PBXTextBookmark */; + 8B7941D521F60C99006E9731 /* PBXTextBookmark */ = 8B7941D521F60C99006E9731 /* PBXTextBookmark */; + 8B7941D921F60CC1006E9731 /* PBXTextBookmark */ = 8B7941D921F60CC1006E9731 /* PBXTextBookmark */; }; sourceControlManager = 8B02375E1D42B1C400E1E8C8 /* Source Control */; userBuildSettings = { @@ -89,9 +89,9 @@ }; 24D8286F09A914000093AEF8 /* ToTape5Proc.cpp */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {621, 10062}}"; - sepNavSelRange = "{39068, 0}"; - sepNavVisRange = "{191, 28}"; + sepNavIntBoundsRect = "{{0, 0}, {554, 9685}}"; + sepNavSelRange = "{584, 0}"; + sepNavVisRange = "{0, 0}"; sepNavWindowFrame = "{{400, 39}, {1005, 839}}"; }; }; @@ -146,25 +146,25 @@ vrLen = 135; vrLoc = 3969; }; - 8B9D716F1F7EFA45007AB60F /* PBXTextBookmark */ = { + 8B7941D521F60C99006E9731 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 24D8286F09A914000093AEF8 /* ToTape5Proc.cpp */; - name = "ToTape5Proc.cpp: 737"; + name = "ToTape5Proc.cpp: 20"; rLen = 0; - rLoc = 39068; + rLoc = 584; rType = 0; - vrLen = 48; - vrLoc = 171; + vrLen = 0; + vrLoc = 0; }; - 8B9D7F411F7FB77C007AB60F /* PBXTextBookmark */ = { + 8B7941D921F60CC1006E9731 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 24D8286F09A914000093AEF8 /* ToTape5Proc.cpp */; - name = "ToTape5Proc.cpp: 738"; + name = "ToTape5Proc.cpp: 21"; rLen = 0; - rLoc = 39068; + rLoc = 584; rType = 0; - vrLen = 28; - vrLoc = 191; + vrLen = 0; + vrLoc = 0; }; 8D01CCC60486CAD60068D4B7 /* ToTape5 */ = { activeExec = 0; diff --git a/plugins/MacVST/ToTape5/ToTape5.xcodeproj/christopherjohnson.perspectivev3 b/plugins/MacVST/ToTape5/ToTape5.xcodeproj/christopherjohnson.perspectivev3 index 6c0395d..9b9bafa 100755 --- a/plugins/MacVST/ToTape5/ToTape5.xcodeproj/christopherjohnson.perspectivev3 +++ b/plugins/MacVST/ToTape5/ToTape5.xcodeproj/christopherjohnson.perspectivev3 @@ -256,8 +256,6 @@ <key>Layout</key> <array> <dict> - <key>BecomeActive</key> - <true/> <key>ContentConfiguration</key> <dict> <key>PBXBottomSmartGroupGIDs</key> @@ -351,13 +349,13 @@ <key>_historyCapacity</key> <integer>0</integer> <key>bookmark</key> - <string>8B9D7F411F7FB77C007AB60F</string> + <string>8B7941D921F60CC1006E9731</string> <key>history</key> <array> <string>8B1A33851F16D336004DE6C5</string> <string>8B1A33A71F16D5B5004DE6C5</string> <string>8B4846EC1F6D3E64007BD0D0</string> - <string>8B9D716F1F7EFA45007AB60F</string> + <string>8B7941D521F60C99006E9731</string> </array> </dict> <key>SplitCount</key> @@ -371,18 +369,18 @@ <key>GeometryConfiguration</key> <dict> <key>Frame</key> - <string>{{0, 0}, {603, 51}}</string> + <string>{{0, 0}, {603, 32}}</string> <key>RubberWindowFrame</key> <string>575 295 810 487 0 0 1440 878 </string> </dict> <key>Module</key> <string>PBXNavigatorGroup</string> <key>Proportion</key> - <string>51pt</string> + <string>32pt</string> </dict> <dict> <key>Proportion</key> - <string>390pt</string> + <string>409pt</string> <key>Tabs</key> <array> <dict> @@ -396,9 +394,7 @@ <key>GeometryConfiguration</key> <dict> <key>Frame</key> - <string>{{10, 27}, {603, 363}}</string> - <key>RubberWindowFrame</key> - <string>575 295 810 487 0 0 1440 878 </string> + <string>{{10, 27}, {603, 382}}</string> </dict> <key>Module</key> <string>XCDetailModule</string> @@ -453,6 +449,8 @@ <dict> <key>Frame</key> <string>{{10, 27}, {603, 382}}</string> + <key>RubberWindowFrame</key> + <string>575 295 810 487 0 0 1440 878 </string> </dict> <key>Module</key> <string>PBXBuildResultsModule</string> @@ -480,11 +478,11 @@ </array> <key>TableOfContents</key> <array> - <string>8B9D7F421F7FB77C007AB60F</string> + <string>8B7941DA21F60CC1006E9731</string> <string>1CA23ED40692098700951B8B</string> - <string>8B9D7F431F7FB77C007AB60F</string> + <string>8B7941DB21F60CC1006E9731</string> <string>8B0237581D42B1C400E1E8C8</string> - <string>8B9D7F441F7FB77C007AB60F</string> + <string>8B7941DC21F60CC1006E9731</string> <string>1CA23EDF0692099D00951B8B</string> <string>1CA23EE00692099D00951B8B</string> <string>1CA23EE10692099D00951B8B</string> @@ -637,7 +635,7 @@ <key>StatusbarIsVisible</key> <true/> <key>TimeStamp</key> - <real>528463740.98537701</real> + <real>569773249.12750697</real> <key>ToolbarConfigUserDefaultsMinorVersion</key> <string>2</string> <key>ToolbarDisplayMode</key> @@ -654,7 +652,7 @@ <integer>5</integer> <key>WindowOrderList</key> <array> - <string>8B9D7F451F7FB77C007AB60F</string> + <string>8B7941DD21F60CC1006E9731</string> <string>/Users/christopherjohnson/Desktop/MacVST/ToTape5/ToTape5.xcodeproj</string> </array> <key>WindowString</key> diff --git a/plugins/MacVST/ToTape5/source/ToTape5.cpp b/plugins/MacVST/ToTape5/source/ToTape5.cpp index 01f61cb..6136aaf 100755 --- a/plugins/MacVST/ToTape5/source/ToTape5.cpp +++ b/plugins/MacVST/ToTape5/source/ToTape5.cpp @@ -98,11 +98,8 @@ ToTape5::ToTape5(audioMasterCallback audioMaster) : hcount = 0; flip = 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/ToTape5/source/ToTape5.h b/plugins/MacVST/ToTape5/source/ToTape5.h index ac26df5..d049014 100755 --- a/plugins/MacVST/ToTape5/source/ToTape5.h +++ b/plugins/MacVST/ToTape5/source/ToTape5.h @@ -140,11 +140,8 @@ private: double iirSampleZR; - long double fpNShapeLA; - long double fpNShapeLB; - long double fpNShapeRA; - long double fpNShapeRB; - bool fpFlip; + long double fpNShapeL; + long double fpNShapeR; //default stuff float A; diff --git a/plugins/MacVST/ToTape5/source/ToTape5Proc.cpp b/plugins/MacVST/ToTape5/source/ToTape5Proc.cpp index 4d2d5c7..5824f80 100755 --- a/plugins/MacVST/ToTape5/source/ToTape5Proc.cpp +++ b/plugins/MacVST/ToTape5/source/ToTape5Proc.cpp @@ -17,7 +17,7 @@ void ToTape5::processReplacing(float **inputs, float **outputs, VstInt32 sampleF double overallscale = 1.0; overallscale /= 44100.0; overallscale *= getSampleRate(); - + long double fpOld = 0.618033988749894848204586; //golden ratio! double inputgain = pow(A+1.0,3); double outputgain = E; double wet = F; @@ -63,9 +63,6 @@ void ToTape5::processReplacing(float **inputs, float **outputs, VstInt32 sampleF double tempSampleR; double drySampleR; - float fpTemp; - long double fpOld = 0.618033988749894848204586; //golden ratio! - long double fpNew = 1.0 - fpOld; long double inputSampleL; long double inputSampleR; @@ -358,25 +355,14 @@ void ToTape5::processReplacing(float **inputs, float **outputs, VstInt32 sampleF 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; @@ -398,7 +384,7 @@ void ToTape5::processDoubleReplacing(double **inputs, double **outputs, VstInt32 double overallscale = 1.0; overallscale /= 44100.0; overallscale *= getSampleRate(); - + long double fpOld = 0.618033988749894848204586; //golden ratio! double inputgain = pow(A+1.0,3); double outputgain = E; double wet = F; @@ -443,10 +429,6 @@ void ToTape5::processDoubleReplacing(double **inputs, double **outputs, VstInt32 double bridgerectifierR; double tempSampleR; double drySampleR; - - 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; @@ -738,25 +720,16 @@ void ToTape5::processDoubleReplacing(double **inputs, double **outputs, VstInt32 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; |