aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/MacAU/ToTape5
diff options
context:
space:
mode:
authorChris Johnson <jinx6568@sover.net>2019-01-27 21:13:54 -0500
committerChris Johnson <jinx6568@sover.net>2019-01-27 21:13:54 -0500
commit966f2d253cd2ee6ce140ad68095a20a9d2b63052 (patch)
treeb0400d95bd06512531ade6ddf55190a58b6a5623 /plugins/MacAU/ToTape5
parent0887543349dbbec0721a1fc8b1c7deba9afefa8b (diff)
downloadairwindows-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/MacAU/ToTape5')
-rwxr-xr-xplugins/MacAU/ToTape5/ToTape5.cpp30
-rwxr-xr-xplugins/MacAU/ToTape5/ToTape5.h5
-rwxr-xr-xplugins/MacAU/ToTape5/ToTape5.xcodeproj/christopherjohnson.pbxuser63
-rwxr-xr-xplugins/MacAU/ToTape5/ToTape5.xcodeproj/christopherjohnson.perspectivev350
4 files changed, 71 insertions, 77 deletions
diff --git a/plugins/MacAU/ToTape5/ToTape5.cpp b/plugins/MacAU/ToTape5/ToTape5.cpp
index abe8496..2135e1d 100755
--- a/plugins/MacAU/ToTape5/ToTape5.cpp
+++ b/plugins/MacAU/ToTape5/ToTape5.cpp
@@ -238,9 +238,7 @@ void ToTape5::ToTape5Kernel::Reset()
sweep = 0.0;
rateof = 0.5;
nextmax = 0.5;
- fpNShapeA = 0.0;
- fpNShapeB = 0.0;
- fpFlip = true;
+ fpNShape = 0.0;
}
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -258,7 +256,8 @@ void ToTape5::ToTape5Kernel::Process( const Float32 *inSourceP,
Float64 overallscale = 1.0;
overallscale /= 44100.0;
overallscale *= GetSampleRate();
-
+ long double fpOld = 0.618033988749894848204586; //golden ratio!
+
Float64 inputgain = pow(GetParameter( kParam_One )+1.0,3);
Float64 outputgain = GetParameter( kParam_Five );
Float64 wet = GetParameter( kParam_Six );
@@ -295,12 +294,7 @@ void ToTape5::ToTape5Kernel::Process( const Float32 *inSourceP,
SInt32 count;
Float64 tempSample;
Float64 drySample;
-
-
long double inputSample;
- Float32 fpTemp;
- long double fpOld = 0.618033988749894848204586; //golden ratio!
- long double fpNew = 1.0 - fpOld;
while (nSampleFrames-- > 0) {
inputSample = *sourceP;
@@ -478,19 +472,11 @@ void ToTape5::ToTape5Kernel::Process( const Float32 *inSourceP,
}
- //noise shaping to 32-bit floating point
- if (fpFlip) {
- fpTemp = inputSample;
- fpNShapeA = (fpNShapeA*fpOld)+((inputSample-fpTemp)*fpNew);
- inputSample += fpNShapeA;
- }
- else {
- fpTemp = inputSample;
- fpNShapeB = (fpNShapeB*fpOld)+((inputSample-fpTemp)*fpNew);
- inputSample += fpNShapeB;
- }
- fpFlip = !fpFlip;
- //end noise shaping on 32 bit output
+ //32 bit dither, made small and tidy.
+ int expon; frexpf((Float32)inputSample, &expon);
+ long double dither = (rand()/(RAND_MAX*7.737125245533627e+25))*pow(2,expon+62);
+ inputSample += (dither-fpNShape); fpNShape = dither;
+ //end 32 bit dither
*destP = inputSample;
diff --git a/plugins/MacAU/ToTape5/ToTape5.h b/plugins/MacAU/ToTape5/ToTape5.h
index 8561873..250d9a5 100755
--- a/plugins/MacAU/ToTape5/ToTape5.h
+++ b/plugins/MacAU/ToTape5/ToTape5.h
@@ -185,10 +185,7 @@ public:
Float64 iirSampleY;
Float64 iirSampleZ;
int flip;
-
- long double fpNShapeA;
- long double fpNShapeB;
- bool fpFlip;
+ long double fpNShape;
};
};
diff --git a/plugins/MacAU/ToTape5/ToTape5.xcodeproj/christopherjohnson.pbxuser b/plugins/MacAU/ToTape5/ToTape5.xcodeproj/christopherjohnson.pbxuser
index b447041..6427718 100755
--- a/plugins/MacAU/ToTape5/ToTape5.xcodeproj/christopherjohnson.pbxuser
+++ b/plugins/MacAU/ToTape5/ToTape5.xcodeproj/christopherjohnson.pbxuser
@@ -10,7 +10,7 @@
PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID;
PBXFileTableDataSourceColumnWidthsKey = (
20,
- 292,
+ 419,
20,
48,
43,
@@ -49,13 +49,14 @@
PBXFileDataSource_Warnings_ColumnID,
);
};
- PBXPerProjectTemplateStateSaveDate = 553894227;
- PBXWorkspaceStateSaveDate = 553894227;
+ PBXPerProjectTemplateStateSaveDate = 569685129;
+ PBXWorkspaceStateSaveDate = 569685129;
};
perUserProjectItems = {
8B1A32741F16BBA2004DE6C5 /* PlistBookmark */ = 8B1A32741F16BBA2004DE6C5 /* PlistBookmark */;
- 8B9D76CF1F7FA38F007AB60F /* PBXTextBookmark */ = 8B9D76CF1F7FA38F007AB60F /* PBXTextBookmark */;
- 8BB8B7D82103C66300751000 /* PBXTextBookmark */ = 8BB8B7D82103C66300751000 /* PBXTextBookmark */;
+ 8B7931A821F4B4FA006E9731 /* PBXTextBookmark */ = 8B7931A821F4B4FA006E9731 /* PBXTextBookmark */;
+ 8B7931AA21F4B4FA006E9731 /* PBXTextBookmark */ = 8B7931AA21F4B4FA006E9731 /* PBXTextBookmark */;
+ 8B7931B321F4B54A006E9731 /* PBXTextBookmark */ = 8B7931B321F4B54A006E9731 /* PBXTextBookmark */;
};
sourceControlManager = 8BD3CCB8148830B20062E48C /* Source Control */;
userBuildSettings = {
@@ -73,21 +74,41 @@
rLen = 0;
rLoc = 9223372036854775808;
};
- 8B9D76CF1F7FA38F007AB60F /* PBXTextBookmark */ = {
+ 8B7931A821F4B4FA006E9731 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 8BC6025B073B072D006C4272 /* ToTape5.h */;
+ name = "ToTape5.h: 187";
+ rLen = 0;
+ rLoc = 6560;
+ rType = 0;
+ vrLen = 717;
+ vrLoc = 5977;
+ };
+ 8B7931AA21F4B4FA006E9731 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 8BA05A660720730100365D66 /* ToTape5.cpp */;
+ name = "ToTape5.cpp: 479";
+ rLen = 0;
+ rLoc = 22753;
+ rType = 0;
+ vrLen = 3225;
+ vrLoc = 19204;
+ };
+ 8B7931B321F4B54A006E9731 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 8BA05A660720730100365D66 /* ToTape5.cpp */;
- name = "ToTape5.cpp: 470";
+ name = "ToTape5.cpp: 260";
rLen = 0;
- rLoc = 22425;
+ rLoc = 11019;
rType = 0;
- vrLen = 472;
- vrLoc = 20068;
+ vrLen = 1511;
+ vrLoc = 10684;
};
8BA05A660720730100365D66 /* ToTape5.cpp */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {873, 6396}}";
- sepNavSelRange = "{22425, 0}";
- sepNavVisRange = "{20304, 236}";
+ sepNavIntBoundsRect = "{{0, 0}, {691, 6929}}";
+ sepNavSelRange = "{11019, 0}";
+ sepNavVisRange = "{10684, 1511}";
sepNavWindowFrame = "{{488, 39}, {952, 839}}";
};
};
@@ -107,21 +128,11 @@
sepNavWindowFrame = "{{15, 39}, {952, 839}}";
};
};
- 8BB8B7D82103C66300751000 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 8BA05A660720730100365D66 /* ToTape5.cpp */;
- name = "ToTape5.cpp: 470";
- rLen = 0;
- rLoc = 22425;
- rType = 0;
- vrLen = 236;
- vrLoc = 20304;
- };
8BC6025B073B072D006C4272 /* ToTape5.h */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {905, 2964}}";
- sepNavSelRange = "{6561, 0}";
- sepNavVisRange = "{5662, 1074}";
+ sepNavIntBoundsRect = "{{0, 0}, {894, 2964}}";
+ sepNavSelRange = "{6560, 0}";
+ sepNavVisRange = "{5977, 717}";
sepNavWindowFrame = "{{470, 39}, {952, 839}}";
};
};
diff --git a/plugins/MacAU/ToTape5/ToTape5.xcodeproj/christopherjohnson.perspectivev3 b/plugins/MacAU/ToTape5/ToTape5.xcodeproj/christopherjohnson.perspectivev3
index 7293723..7e231dd 100755
--- a/plugins/MacAU/ToTape5/ToTape5.xcodeproj/christopherjohnson.perspectivev3
+++ b/plugins/MacAU/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>
@@ -282,7 +280,7 @@
<dict>
<key>PBXSmartGroupTreeModuleColumnWidthsKey</key>
<array>
- <real>288</real>
+ <real>161</real>
</array>
<key>PBXSmartGroupTreeModuleColumnsKey_v4</key>
<array>
@@ -308,7 +306,7 @@
</array>
</array>
<key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key>
- <string>{{0, 0}, {288, 595}}</string>
+ <string>{{0, 0}, {161, 595}}</string>
</dict>
<key>PBXTopSmartGroupGIDs</key>
<array/>
@@ -318,24 +316,26 @@
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
- <string>{{0, 0}, {305, 613}}</string>
+ <string>{{0, 0}, {178, 613}}</string>
<key>GroupTreeTableConfiguration</key>
<array>
<string>MainColumn</string>
- <real>288</real>
+ <real>161</real>
</array>
<key>RubberWindowFrame</key>
- <string>581 201 841 654 0 0 1440 878 </string>
+ <string>490 203 841 654 0 0 1440 878 </string>
</dict>
<key>Module</key>
<string>PBXSmartGroupTreeModule</string>
<key>Proportion</key>
- <string>305pt</string>
+ <string>178pt</string>
</dict>
<dict>
<key>Dock</key>
<array>
<dict>
+ <key>BecomeActive</key>
+ <true/>
<key>ContentConfiguration</key>
<dict>
<key>PBXProjectModuleGUID</key>
@@ -353,11 +353,12 @@
<key>_historyCapacity</key>
<integer>0</integer>
<key>bookmark</key>
- <string>8BB8B7D82103C66300751000</string>
+ <string>8B7931B321F4B54A006E9731</string>
<key>history</key>
<array>
<string>8B1A32741F16BBA2004DE6C5</string>
- <string>8B9D76CF1F7FA38F007AB60F</string>
+ <string>8B7931A821F4B4FA006E9731</string>
+ <string>8B7931AA21F4B4FA006E9731</string>
</array>
</dict>
<key>SplitCount</key>
@@ -371,18 +372,18 @@
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
- <string>{{0, 0}, {531, 56}}</string>
+ <string>{{0, 0}, {658, 481}}</string>
<key>RubberWindowFrame</key>
- <string>581 201 841 654 0 0 1440 878 </string>
+ <string>490 203 841 654 0 0 1440 878 </string>
</dict>
<key>Module</key>
<string>PBXNavigatorGroup</string>
<key>Proportion</key>
- <string>56pt</string>
+ <string>481pt</string>
</dict>
<dict>
<key>Proportion</key>
- <string>552pt</string>
+ <string>127pt</string>
<key>Tabs</key>
<array>
<dict>
@@ -396,9 +397,7 @@
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
- <string>{{10, 27}, {531, 525}}</string>
- <key>RubberWindowFrame</key>
- <string>581 201 841 654 0 0 1440 878 </string>
+ <string>{{10, 27}, {658, 100}}</string>
</dict>
<key>Module</key>
<string>XCDetailModule</string>
@@ -452,7 +451,9 @@
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
- <string>{{10, 27}, {531, 327}}</string>
+ <string>{{10, 27}, {658, 100}}</string>
+ <key>RubberWindowFrame</key>
+ <string>490 203 841 654 0 0 1440 878 </string>
</dict>
<key>Module</key>
<string>PBXBuildResultsModule</string>
@@ -461,7 +462,7 @@
</dict>
</array>
<key>Proportion</key>
- <string>531pt</string>
+ <string>658pt</string>
</dict>
</array>
<key>Name</key>
@@ -480,11 +481,11 @@
</array>
<key>TableOfContents</key>
<array>
- <string>8BB8B7D92103C66300751000</string>
+ <string>8B7931B421F4B54A006E9731</string>
<string>1CA23ED40692098700951B8B</string>
- <string>8BB8B7DA2103C66300751000</string>
+ <string>8B7931B521F4B54A006E9731</string>
<string>8BD7274A1D46E5A5000176F0</string>
- <string>8BB8B7DB2103C66300751000</string>
+ <string>8B7931B621F4B54A006E9731</string>
<string>1CA23EDF0692099D00951B8B</string>
<string>1CA23EE00692099D00951B8B</string>
<string>1CA23EE10692099D00951B8B</string>
@@ -657,7 +658,7 @@
<key>StatusbarIsVisible</key>
<true/>
<key>TimeStamp</key>
- <real>553895523.636742</real>
+ <real>569685322.27313697</real>
<key>ToolbarConfigUserDefaultsMinorVersion</key>
<string>2</string>
<key>ToolbarDisplayMode</key>
@@ -674,11 +675,10 @@
<integer>5</integer>
<key>WindowOrderList</key>
<array>
- <string>8BB8B7DC2103C66300751000</string>
<string>/Users/christopherjohnson/Desktop/MacAU/ToTape5/ToTape5.xcodeproj</string>
</array>
<key>WindowString</key>
- <string>581 201 841 654 0 0 1440 878 </string>
+ <string>490 203 841 654 0 0 1440 878 </string>
<key>WindowToolsV3</key>
<array>
<dict>
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-27 12:06:54 +0000