aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/MacAU/SurgeTide
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/SurgeTide
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/SurgeTide')
-rwxr-xr-xplugins/MacAU/SurgeTide/SurgeTide.cpp42
-rwxr-xr-xplugins/MacAU/SurgeTide/SurgeTide.h7
-rwxr-xr-xplugins/MacAU/SurgeTide/SurgeTide.xcodeproj/christopherjohnson.pbxuser84
-rwxr-xr-xplugins/MacAU/SurgeTide/SurgeTide.xcodeproj/christopherjohnson.perspectivev346
4 files changed, 77 insertions, 102 deletions
diff --git a/plugins/MacAU/SurgeTide/SurgeTide.cpp b/plugins/MacAU/SurgeTide/SurgeTide.cpp
index 2a2fe42..3a415f2 100755
--- a/plugins/MacAU/SurgeTide/SurgeTide.cpp
+++ b/plugins/MacAU/SurgeTide/SurgeTide.cpp
@@ -188,11 +188,8 @@ ComponentResult SurgeTide::Initialize()
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
ComponentResult SurgeTide::Reset(AudioUnitScope inScope, AudioUnitElement inElement)
{
- fpNShapeAL = 0.0;
- fpNShapeBL = 0.0;
- fpNShapeAR = 0.0;
- fpNShapeBR = 0.0;
- flip = true;
+ fpNShapeL = 0.0;
+ fpNShapeR = 0.0;
chaseA = 0.0;
chaseB = 0.0;
chaseC = 0.0;
@@ -215,11 +212,7 @@ OSStatus SurgeTide::ProcessBufferLists(AudioUnitRenderActionFlags & ioActionFla
Float64 overallscale = 1.0;
overallscale /= 44100.0;
overallscale *= GetSampleRate();
-
- Float32 fpTemp;
- long double fpOld = 0.618033988749894848204586; //golden ratio!
- long double fpNew = 1.0 - fpOld;
-
+
long double inputSampleL;
long double inputSampleR;
long double drySampleL;
@@ -309,27 +302,14 @@ OSStatus SurgeTide::ProcessBufferLists(AudioUnitRenderActionFlags & ioActionFla
inputSampleR = drySampleR - (inputSampleR * intensity);
inputSampleR = (drySampleR * dry) + (inputSampleR * wet);
- //noise shaping to 32-bit floating point
- if (flip) {
- fpTemp = inputSampleL;
- fpNShapeAL = (fpNShapeAL*fpOld)+((inputSampleL-fpTemp)*fpNew);
- inputSampleL += fpNShapeAL;
-
- fpTemp = inputSampleR;
- fpNShapeAR = (fpNShapeAR*fpOld)+((inputSampleR-fpTemp)*fpNew);
- inputSampleR += fpNShapeAR;
- }
- else {
- fpTemp = inputSampleL;
- fpNShapeBL = (fpNShapeBL*fpOld)+((inputSampleL-fpTemp)*fpNew);
- inputSampleL += fpNShapeBL;
-
- fpTemp = inputSampleR;
- fpNShapeBR = (fpNShapeBR*fpOld)+((inputSampleR-fpTemp)*fpNew);
- inputSampleR += fpNShapeBR;
- }
- flip = !flip;
- //end noise shaping on 32 bit output
+ //stereo 32 bit dither, made small and tidy.
+ int expon; frexpf((Float32)inputSampleL, &expon);
+ long double dither = (rand()/(RAND_MAX*7.737125245533627e+25))*pow(2,expon+62);
+ inputSampleL += (dither-fpNShapeL); fpNShapeL = dither;
+ frexpf((Float32)inputSampleR, &expon);
+ dither = (rand()/(RAND_MAX*7.737125245533627e+25))*pow(2,expon+62);
+ inputSampleR += (dither-fpNShapeR); fpNShapeR = dither;
+ //end 32 bit dither
*outputL = inputSampleL;
*outputR = inputSampleR;
diff --git a/plugins/MacAU/SurgeTide/SurgeTide.h b/plugins/MacAU/SurgeTide/SurgeTide.h
index f62817e..a72f6c6 100755
--- a/plugins/MacAU/SurgeTide/SurgeTide.h
+++ b/plugins/MacAU/SurgeTide/SurgeTide.h
@@ -115,11 +115,8 @@ public:
virtual ComponentResult Version() { return kSurgeTideVersion; }
private:
- long double fpNShapeAL;
- long double fpNShapeBL;
- long double fpNShapeAR;
- long double fpNShapeBR;
- bool flip;
+ long double fpNShapeL;
+ long double fpNShapeR;
long double chaseA;
long double chaseB;
long double chaseC;
diff --git a/plugins/MacAU/SurgeTide/SurgeTide.xcodeproj/christopherjohnson.pbxuser b/plugins/MacAU/SurgeTide/SurgeTide.xcodeproj/christopherjohnson.pbxuser
index 40a4ff3..72c4866 100755
--- a/plugins/MacAU/SurgeTide/SurgeTide.xcodeproj/christopherjohnson.pbxuser
+++ b/plugins/MacAU/SurgeTide/SurgeTide.xcodeproj/christopherjohnson.pbxuser
@@ -10,7 +10,7 @@
PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID;
PBXFileTableDataSourceColumnWidthsKey = (
20,
- 292,
+ 316,
20,
48,
43,
@@ -49,40 +49,20 @@
PBXFileDataSource_Warnings_ColumnID,
);
};
- PBXPerProjectTemplateStateSaveDate = 543460920;
- PBXWorkspaceStateSaveDate = 543460920;
+ PBXPerProjectTemplateStateSaveDate = 569682693;
+ PBXWorkspaceStateSaveDate = 569682693;
};
perUserProjectItems = {
- 8B050BEA20648E5500700365 /* PBXTextBookmark */ = 8B050BEA20648E5500700365 /* PBXTextBookmark */;
- 8B050BEB20648E5500700365 /* PBXTextBookmark */ = 8B050BEB20648E5500700365 /* PBXTextBookmark */;
8B3221941DC3CF2D00C1FCDF /* PlistBookmark */ = 8B3221941DC3CF2D00C1FCDF /* PlistBookmark */;
8B3DF6731E6A5BAE00E788B6 /* PBXTextBookmark */ = 8B3DF6731E6A5BAE00E788B6 /* PBXTextBookmark */;
- 8BC9089C1DC7FFFE008187BE /* PBXTextBookmark */ = 8BC9089C1DC7FFFE008187BE /* PBXTextBookmark */;
+ 8B7930E821F4AB6C006E9731 /* PBXTextBookmark */ = 8B7930E821F4AB6C006E9731 /* PBXTextBookmark */;
+ 8B7930EA21F4AB6C006E9731 /* PBXTextBookmark */ = 8B7930EA21F4AB6C006E9731 /* PBXTextBookmark */;
+ 8B7930EF21F4AB96006E9731 /* PBXTextBookmark */ = 8B7930EF21F4AB96006E9731 /* PBXTextBookmark */;
};
sourceControlManager = 8BD3CCB8148830B20062E48C /* Source Control */;
userBuildSettings = {
};
};
- 8B050BEA20648E5500700365 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 8BC6025B073B072D006C4272 /* SurgeTide.h */;
- name = "SurgeTide.h: 132";
- rLen = 0;
- rLoc = 5345;
- rType = 0;
- vrLen = 263;
- vrLoc = 5082;
- };
- 8B050BEB20648E5500700365 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 8BA05A660720730100365D66 /* SurgeTide.cpp */;
- name = "SurgeTide.cpp: 303";
- rLen = 0;
- rLoc = 12636;
- rType = 0;
- vrLen = 1129;
- vrLoc = 12486;
- };
8B3221941DC3CF2D00C1FCDF /* PlistBookmark */ = {
isa = PlistBookmark;
fRef = 8D01CCD10486CAD60068D4B7 /* Info.plist */;
@@ -105,11 +85,41 @@
vrLen = 359;
vrLoc = 2598;
};
+ 8B7930E821F4AB6C006E9731 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 8BC6025B073B072D006C4272 /* SurgeTide.h */;
+ name = "SurgeTide.h: 119";
+ rLen = 0;
+ rLoc = 5103;
+ rType = 0;
+ vrLen = 1669;
+ vrLoc = 3609;
+ };
+ 8B7930EA21F4AB6C006E9731 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 8BA05A660720730100365D66 /* SurgeTide.cpp */;
+ name = "SurgeTide.cpp: 313";
+ rLen = 0;
+ rLoc = 13187;
+ rType = 0;
+ vrLen = 1366;
+ vrLoc = 12024;
+ };
+ 8B7930EF21F4AB96006E9731 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 8BA05A660720730100365D66 /* SurgeTide.cpp */;
+ name = "SurgeTide.cpp: 313";
+ rLen = 0;
+ rLoc = 13187;
+ rType = 0;
+ vrLen = 1259;
+ vrLoc = 11985;
+ };
8BA05A660720730100365D66 /* SurgeTide.cpp */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {803, 4680}}";
- sepNavSelRange = "{12636, 0}";
- sepNavVisRange = "{12486, 1129}";
+ sepNavIntBoundsRect = "{{0, 0}, {691, 4498}}";
+ sepNavSelRange = "{13187, 0}";
+ sepNavVisRange = "{11985, 1259}";
sepNavWindowFrame = "{{758, 43}, {679, 835}}";
};
};
@@ -123,22 +133,12 @@
};
8BC6025B073B072D006C4272 /* SurgeTide.h */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {894, 1846}}";
- sepNavSelRange = "{5345, 0}";
- sepNavVisRange = "{5082, 263}";
+ sepNavIntBoundsRect = "{{0, 0}, {894, 1703}}";
+ sepNavSelRange = "{5103, 0}";
+ sepNavVisRange = "{3609, 1669}";
sepNavWindowFrame = "{{755, 43}, {679, 835}}";
};
};
- 8BC9089C1DC7FFFE008187BE /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 8BA05A660720730100365D66 /* SurgeTide.cpp */;
- name = "SurgeTide.cpp: 304";
- rLen = 0;
- rLoc = 13729;
- rType = 0;
- vrLen = 592;
- vrLoc = 10562;
- };
8BD3CCB8148830B20062E48C /* Source Control */ = {
isa = PBXSourceControlManager;
fallbackIsa = XCSourceControlManager;
diff --git a/plugins/MacAU/SurgeTide/SurgeTide.xcodeproj/christopherjohnson.perspectivev3 b/plugins/MacAU/SurgeTide/SurgeTide.xcodeproj/christopherjohnson.perspectivev3
index 5941322..f9eb835 100755
--- a/plugins/MacAU/SurgeTide/SurgeTide.xcodeproj/christopherjohnson.perspectivev3
+++ b/plugins/MacAU/SurgeTide/SurgeTide.xcodeproj/christopherjohnson.perspectivev3
@@ -225,8 +225,8 @@
<array/>
<key>PerspectiveWidths</key>
<array>
- <integer>841</integer>
- <integer>841</integer>
+ <integer>865</integer>
+ <integer>865</integer>
</array>
<key>Perspectives</key>
<array>
@@ -306,7 +306,7 @@
</array>
</array>
<key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key>
- <string>{{0, 0}, {288, 595}}</string>
+ <string>{{0, 0}, {288, 707}}</string>
</dict>
<key>PBXTopSmartGroupGIDs</key>
<array/>
@@ -316,14 +316,14 @@
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
- <string>{{0, 0}, {305, 613}}</string>
+ <string>{{0, 0}, {305, 725}}</string>
<key>GroupTreeTableConfiguration</key>
<array>
<string>MainColumn</string>
<real>288</real>
</array>
<key>RubberWindowFrame</key>
- <string>599 190 841 654 0 0 1440 878 </string>
+ <string>436 94 865 766 0 0 1440 878 </string>
</dict>
<key>Module</key>
<string>PBXSmartGroupTreeModule</string>
@@ -334,8 +334,6 @@
<key>Dock</key>
<array>
<dict>
- <key>BecomeActive</key>
- <true/>
<key>ContentConfiguration</key>
<dict>
<key>PBXProjectModuleGUID</key>
@@ -353,13 +351,13 @@
<key>_historyCapacity</key>
<integer>0</integer>
<key>bookmark</key>
- <string>8B050BEB20648E5500700365</string>
+ <string>8B7930EF21F4AB96006E9731</string>
<key>history</key>
<array>
<string>8B3221941DC3CF2D00C1FCDF</string>
<string>8B3DF6731E6A5BAE00E788B6</string>
- <string>8B050BEA20648E5500700365</string>
- <string>8BC9089C1DC7FFFE008187BE</string>
+ <string>8B7930E821F4AB6C006E9731</string>
+ <string>8B7930EA21F4AB6C006E9731</string>
</array>
</dict>
<key>SplitCount</key>
@@ -373,18 +371,18 @@
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
- <string>{{0, 0}, {531, 502}}</string>
+ <string>{{0, 0}, {555, 495}}</string>
<key>RubberWindowFrame</key>
- <string>599 190 841 654 0 0 1440 878 </string>
+ <string>436 94 865 766 0 0 1440 878 </string>
</dict>
<key>Module</key>
<string>PBXNavigatorGroup</string>
<key>Proportion</key>
- <string>502pt</string>
+ <string>495pt</string>
</dict>
<dict>
<key>Proportion</key>
- <string>106pt</string>
+ <string>225pt</string>
<key>Tabs</key>
<array>
<dict>
@@ -398,9 +396,7 @@
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
- <string>{{10, 27}, {531, 79}}</string>
- <key>RubberWindowFrame</key>
- <string>599 190 841 654 0 0 1440 878 </string>
+ <string>{{10, 27}, {555, 83}}</string>
</dict>
<key>Module</key>
<string>XCDetailModule</string>
@@ -454,7 +450,9 @@
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
- <string>{{10, 27}, {531, 315}}</string>
+ <string>{{10, 27}, {555, 198}}</string>
+ <key>RubberWindowFrame</key>
+ <string>436 94 865 766 0 0 1440 878 </string>
</dict>
<key>Module</key>
<string>PBXBuildResultsModule</string>
@@ -463,7 +461,7 @@
</dict>
</array>
<key>Proportion</key>
- <string>531pt</string>
+ <string>555pt</string>
</dict>
</array>
<key>Name</key>
@@ -482,11 +480,11 @@
</array>
<key>TableOfContents</key>
<array>
- <string>8B050BEC20648E5500700365</string>
+ <string>8B7930F021F4AB96006E9731</string>
<string>1CA23ED40692098700951B8B</string>
- <string>8B050BED20648E5500700365</string>
+ <string>8B7930F121F4AB96006E9731</string>
<string>8BD7274A1D46E5A5000176F0</string>
- <string>8B050BEE20648E5500700365</string>
+ <string>8B7930F221F4AB96006E9731</string>
<string>1CA23EDF0692099D00951B8B</string>
<string>1CA23EE00692099D00951B8B</string>
<string>1CA23EE10692099D00951B8B</string>
@@ -659,7 +657,7 @@
<key>StatusbarIsVisible</key>
<true/>
<key>TimeStamp</key>
- <real>543460949.69104803</real>
+ <real>569682838.98241794</real>
<key>ToolbarConfigUserDefaultsMinorVersion</key>
<string>2</string>
<key>ToolbarDisplayMode</key>
@@ -679,7 +677,7 @@
<string>/Users/christopherjohnson/Desktop/MacAU/SurgeTide/SurgeTide.xcodeproj</string>
</array>
<key>WindowString</key>
- <string>599 190 841 654 0 0 1440 878 </string>
+ <string>436 94 865 766 0 0 1440 878 </string>
<key>WindowToolsV3</key>
<array>
<dict>