aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/MacAU/ADClip7
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/ADClip7
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/ADClip7')
-rwxr-xr-xplugins/MacAU/ADClip7/ADClip7.cpp23
-rwxr-xr-xplugins/MacAU/ADClip7/ADClip7.h4
-rwxr-xr-xplugins/MacAU/ADClip7/ADClip7.xcodeproj/christopherjohnson.pbxuser66
-rwxr-xr-xplugins/MacAU/ADClip7/ADClip7.xcodeproj/christopherjohnson.perspectivev341
4 files changed, 60 insertions, 74 deletions
diff --git a/plugins/MacAU/ADClip7/ADClip7.cpp b/plugins/MacAU/ADClip7/ADClip7.cpp
index 688c254..4835b0f 100755
--- a/plugins/MacAU/ADClip7/ADClip7.cpp
+++ b/plugins/MacAU/ADClip7/ADClip7.cpp
@@ -205,9 +205,7 @@ void ADClip7::ADClip7Kernel::Reset()
refclip = 0.99;
iirLowsA = 0.0;
iirLowsB = 0.0;
- fpNShapeA = 0.0;
- fpNShapeB = 0.0;
- fpFlip = true;
+ fpNShape = 0.0;
}
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -225,7 +223,6 @@ void ADClip7::ADClip7Kernel::Process( const Float32 *inSourceP,
Float64 overallscale = 1.0;
overallscale /= 44100.0;
overallscale *= GetSampleRate();
- Float32 fpTemp;
Float64 fpOld = 0.618033988749894848204586; //golden ratio!
Float64 fpNew = 1.0 - fpOld;
@@ -479,19 +476,11 @@ void ADClip7::ADClip7Kernel::Process( const Float32 *inSourceP,
if (inputSample < -refclip) inputSample = -refclip;
//final iron bar
- //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 = not 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/ADClip7/ADClip7.h b/plugins/MacAU/ADClip7/ADClip7.h
index 5388f80..215cc2c 100755
--- a/plugins/MacAU/ADClip7/ADClip7.h
+++ b/plugins/MacAU/ADClip7/ADClip7.h
@@ -148,9 +148,7 @@ public:
Float64 iirLowsA;
Float64 iirLowsB;
long double refclip;
- long double fpNShapeA;
- long double fpNShapeB;
- bool fpFlip;
+ long double fpNShape;
};
};
diff --git a/plugins/MacAU/ADClip7/ADClip7.xcodeproj/christopherjohnson.pbxuser b/plugins/MacAU/ADClip7/ADClip7.xcodeproj/christopherjohnson.pbxuser
index 6d857bb..941868c 100755
--- a/plugins/MacAU/ADClip7/ADClip7.xcodeproj/christopherjohnson.pbxuser
+++ b/plugins/MacAU/ADClip7/ADClip7.xcodeproj/christopherjohnson.pbxuser
@@ -49,55 +49,45 @@
PBXFileDataSource_Warnings_ColumnID,
);
};
- PBXPerProjectTemplateStateSaveDate = 538004990;
- PBXWorkspaceStateSaveDate = 538004990;
+ PBXPerProjectTemplateStateSaveDate = 569587824;
+ PBXWorkspaceStateSaveDate = 569587824;
};
perUserProjectItems = {
- 8B79CD0220114E0500E8A187 /* PBXTextBookmark */ = 8B79CD0220114E0500E8A187 /* PBXTextBookmark */;
- 8B7B31211F8EA92200DC6305 /* PBXTextBookmark */ = 8B7B31211F8EA92200DC6305 /* PBXTextBookmark */;
- 8B80DAAF1F83179100B72A72 /* PBXTextBookmark */ = 8B80DAAF1F83179100B72A72 /* PBXTextBookmark */;
+ 8B79272821F33919006E9731 /* PBXTextBookmark */ = 8B79272821F33919006E9731 /* PBXTextBookmark */;
+ 8B79273321F33979006E9731 /* PBXTextBookmark */ = 8B79273321F33979006E9731 /* PBXTextBookmark */;
8BAC117C1F8245C00066CBCE /* PlistBookmark */ = 8BAC117C1F8245C00066CBCE /* PlistBookmark */;
+ 8BBB330321C4563C00825986 /* PBXTextBookmark */ = 8BBB330321C4563C00825986 /* PBXTextBookmark */;
};
sourceControlManager = 8BD3CCB8148830B20062E48C /* Source Control */;
userBuildSettings = {
};
};
- 8B79CD0220114E0500E8A187 /* PBXTextBookmark */ = {
+ 8B79272821F33919006E9731 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
- fRef = 8BC6025B073B072D006C4272 /* ADClip7.h */;
- name = "ADClip7.h: 58";
- rLen = 0;
- rLoc = 2914;
- rType = 0;
- vrLen = 231;
- vrLoc = 2754;
- };
- 8B7B31211F8EA92200DC6305 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 8BC6025B073B072D006C4272 /* ADClip7.h */;
- name = "ADClip7.h: 58";
- rLen = 0;
- rLoc = 2914;
+ fRef = 8BA05A660720730100365D66 /* ADClip7.cpp */;
+ name = "ADClip7.cpp: 205";
+ rLen = 7;
+ rLoc = 9006;
rType = 0;
- vrLen = 253;
- vrLoc = 2732;
+ vrLen = 261;
+ vrLoc = 9866;
};
- 8B80DAAF1F83179100B72A72 /* PBXTextBookmark */ = {
+ 8B79273321F33979006E9731 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 8BA05A660720730100365D66 /* ADClip7.cpp */;
name = "ADClip7.cpp: 205";
rLen = 7;
rLoc = 9006;
rType = 0;
- vrLen = 372;
- vrLoc = 9703;
+ vrLen = 215;
+ vrLoc = 9864;
};
8BA05A660720730100365D66 /* ADClip7.cpp */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {980, 7163}}";
- sepNavSelRange = "{18297, 0}";
- sepNavVisRange = "{17647, 1478}";
- sepNavWindowFrame = "{{335, 43}, {1027, 835}}";
+ sepNavIntBoundsRect = "{{0, 0}, {572, 6513}}";
+ sepNavSelRange = "{9006, 7}";
+ sepNavVisRange = "{9864, 215}";
+ sepNavWindowFrame = "{{327, 43}, {1027, 835}}";
};
};
8BA05A690720730100365D66 /* ADClip7Version.h */ = {
@@ -120,12 +110,22 @@
rLen = 0;
rLoc = 9223372036854775808;
};
+ 8BBB330321C4563C00825986 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 8BC6025B073B072D006C4272 /* ADClip7.h */;
+ name = "ADClip7.h: 58";
+ rLen = 0;
+ rLoc = 2914;
+ rType = 0;
+ vrLen = 229;
+ vrLoc = 2756;
+ };
8BC6025B073B072D006C4272 /* ADClip7.h */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {803, 2197}}";
- sepNavSelRange = "{2914, 0}";
- sepNavVisRange = "{2754, 231}";
- sepNavWindowFrame = "{{859, 43}, {1027, 835}}";
+ sepNavIntBoundsRect = "{{0, 0}, {980, 2132}}";
+ sepNavSelRange = "{5842, 0}";
+ sepNavVisRange = "{4309, 1634}";
+ sepNavWindowFrame = "{{413, 43}, {1027, 835}}";
};
};
8BD3CCB8148830B20062E48C /* Source Control */ = {
diff --git a/plugins/MacAU/ADClip7/ADClip7.xcodeproj/christopherjohnson.perspectivev3 b/plugins/MacAU/ADClip7/ADClip7.xcodeproj/christopherjohnson.perspectivev3
index 7b3b431..186a188 100755
--- a/plugins/MacAU/ADClip7/ADClip7.xcodeproj/christopherjohnson.perspectivev3
+++ b/plugins/MacAU/ADClip7/ADClip7.xcodeproj/christopherjohnson.perspectivev3
@@ -256,8 +256,6 @@
<key>Layout</key>
<array>
<dict>
- <key>BecomeActive</key>
- <true/>
<key>ContentConfiguration</key>
<dict>
<key>PBXBottomSmartGroupGIDs</key>
@@ -326,7 +324,7 @@
<real>288</real>
</array>
<key>RubberWindowFrame</key>
- <string>599 170 841 654 0 0 1440 878 </string>
+ <string>391 159 841 654 0 0 1440 878 </string>
</dict>
<key>Module</key>
<string>PBXSmartGroupTreeModule</string>
@@ -342,7 +340,7 @@
<key>PBXProjectModuleGUID</key>
<string>8BD7274A1D46E5A5000176F0</string>
<key>PBXProjectModuleLabel</key>
- <string>ADClip7.h</string>
+ <string>ADClip7.cpp</string>
<key>PBXSplitModuleInNavigatorKey</key>
<dict>
<key>Split0</key>
@@ -350,16 +348,16 @@
<key>PBXProjectModuleGUID</key>
<string>8BD7274B1D46E5A5000176F0</string>
<key>PBXProjectModuleLabel</key>
- <string>ADClip7.h</string>
+ <string>ADClip7.cpp</string>
<key>_historyCapacity</key>
<integer>0</integer>
<key>bookmark</key>
- <string>8B79CD0220114E0500E8A187</string>
+ <string>8B79273321F33979006E9731</string>
<key>history</key>
<array>
<string>8BAC117C1F8245C00066CBCE</string>
- <string>8B80DAAF1F83179100B72A72</string>
- <string>8B7B31211F8EA92200DC6305</string>
+ <string>8BBB330321C4563C00825986</string>
+ <string>8B79272821F33919006E9731</string>
</array>
</dict>
<key>SplitCount</key>
@@ -373,18 +371,18 @@
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
- <string>{{0, 0}, {531, 126}}</string>
+ <string>{{0, 0}, {531, 92}}</string>
<key>RubberWindowFrame</key>
- <string>599 170 841 654 0 0 1440 878 </string>
+ <string>391 159 841 654 0 0 1440 878 </string>
</dict>
<key>Module</key>
<string>PBXNavigatorGroup</string>
<key>Proportion</key>
- <string>126pt</string>
+ <string>92pt</string>
</dict>
<dict>
<key>Proportion</key>
- <string>482pt</string>
+ <string>516pt</string>
<key>Tabs</key>
<array>
<dict>
@@ -398,9 +396,7 @@
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
- <string>{{10, 27}, {531, 455}}</string>
- <key>RubberWindowFrame</key>
- <string>599 170 841 654 0 0 1440 878 </string>
+ <string>{{10, 27}, {531, 489}}</string>
</dict>
<key>Module</key>
<string>XCDetailModule</string>
@@ -454,7 +450,9 @@
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
- <string>{{10, 27}, {531, 379}}</string>
+ <string>{{10, 27}, {531, 489}}</string>
+ <key>RubberWindowFrame</key>
+ <string>391 159 841 654 0 0 1440 878 </string>
</dict>
<key>Module</key>
<string>PBXBuildResultsModule</string>
@@ -482,11 +480,11 @@
</array>
<key>TableOfContents</key>
<array>
- <string>8B79CD0320114E0500E8A187</string>
+ <string>8B79273421F33979006E9731</string>
<string>1CA23ED40692098700951B8B</string>
- <string>8B79CD0420114E0500E8A187</string>
+ <string>8B79273521F33979006E9731</string>
<string>8BD7274A1D46E5A5000176F0</string>
- <string>8B79CD0520114E0500E8A187</string>
+ <string>8B79273621F33979006E9731</string>
<string>1CA23EDF0692099D00951B8B</string>
<string>1CA23EE00692099D00951B8B</string>
<string>1CA23EE10692099D00951B8B</string>
@@ -659,7 +657,7 @@
<key>StatusbarIsVisible</key>
<true/>
<key>TimeStamp</key>
- <real>538004997.98427904</real>
+ <real>569588089.57457805</real>
<key>ToolbarConfigUserDefaultsMinorVersion</key>
<string>2</string>
<key>ToolbarDisplayMode</key>
@@ -676,10 +674,11 @@
<integer>5</integer>
<key>WindowOrderList</key>
<array>
+ <string>8B79273721F33979006E9731</string>
<string>/Users/christopherjohnson/Desktop/MacAU/ADClip7/ADClip7.xcodeproj</string>
</array>
<key>WindowString</key>
- <string>599 170 841 654 0 0 1440 878 </string>
+ <string>391 159 841 654 0 0 1440 878 </string>
<key>WindowToolsV3</key>
<array>
<dict>