Floating Point Dither For All

4 files changed, 47 insertions, 65 deletions

diff --git a/plugins/MacAU/Capacitor/Capacitor.cpp b/plugins/MacAU/Capacitor/Capacitor.cpp
index f810f0e..bfe38c2 100755
--- a/plugins/MacAU/Capacitor/Capacitor.cpp
+++ b/plugins/MacAU/Capacitor/Capacitor.cpp
@@ -196,9 +196,7 @@ void		Capacitor::CapacitorKernel::Reset()
 	lastLowpass = 1000.0;
 	lastHighpass = 1000.0;
 	lastWet = 1000.0;
-	fpNShapeA = 0.0;
-	fpNShapeB = 0.0;
-	fpFlip = true;
+	fpNShape = 0.0;
 }
 
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -229,9 +227,6 @@ void		Capacitor::CapacitorKernel::Process(	const Float32 	*inSourceP,
 	Float64 invLowpass;
 	Float64 invHighpass;
 	Float64 dry;
-	Float32 fpTemp;
-	long double fpOld = 0.618033988749894848204586; //golden ratio!
-	long double fpNew = 1.0 - fpOld;	
 
 	long double inputSample;
 	Float32 drySample;
@@ -324,19 +319,11 @@ void		Capacitor::CapacitorKernel::Process(	const Float32 	*inSourceP,
 		
 		inputSample = (drySample * dry) + (inputSample * wet);
 
-		//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/Capacitor/Capacitor.h b/plugins/MacAU/Capacitor/Capacitor.h
index 92ca84a..7608462 100755
--- a/plugins/MacAU/Capacitor/Capacitor.h
+++ b/plugins/MacAU/Capacitor/Capacitor.h
@@ -158,9 +158,7 @@ public:
 		Float64 lastHighpass;
 		Float64 lastWet;
 		
-		long double fpNShapeA;
-		long double fpNShapeB;
-		bool fpFlip;
+		long double fpNShape;
 	};
 };
 
diff --git a/plugins/MacAU/Capacitor/Capacitor.xcodeproj/christopherjohnson.pbxuser b/plugins/MacAU/Capacitor/Capacitor.xcodeproj/christopherjohnson.pbxuser
index 2351b87..3c205e0 100755
--- a/plugins/MacAU/Capacitor/Capacitor.xcodeproj/christopherjohnson.pbxuser
+++ b/plugins/MacAU/Capacitor/Capacitor.xcodeproj/christopherjohnson.pbxuser
@@ -51,13 +51,13 @@
 					PBXFileDataSource_Warnings_ColumnID,
 				);
 			};
-			PBXPerProjectTemplateStateSaveDate = 531742140;
-			PBXWorkspaceStateSaveDate = 531742140;
+			PBXPerProjectTemplateStateSaveDate = 569590853;
+			PBXWorkspaceStateSaveDate = 569590853;
 		};
 		perUserProjectItems = {
 			8B558E341E54FD3900D04D0B /* PlistBookmark */ = 8B558E341E54FD3900D04D0B /* PlistBookmark */;
-			8B6692B51FB1BDCA007B3434 /* PBXTextBookmark */ = 8B6692B51FB1BDCA007B3434 /* PBXTextBookmark */;
-			8B6692B61FB1BDCA007B3434 /* PBXTextBookmark */ = 8B6692B61FB1BDCA007B3434 /* PBXTextBookmark */;
+			8B7928D921F344BA006E9731 /* PBXTextBookmark */ = 8B7928D921F344BA006E9731 /* PBXTextBookmark */;
+			8B7928DE21F344CC006E9731 /* PBXTextBookmark */ = 8B7928DE21F344CC006E9731 /* PBXTextBookmark */;
 		};
 		sourceControlManager = 8BD3CCB8148830B20062E48C /* Source Control */;
 		userBuildSettings = {
@@ -75,32 +75,32 @@
 		rLen = 0;
 		rLoc = 9223372036854775808;
 	};
-	8B6692B51FB1BDCA007B3434 /* PBXTextBookmark */ = {
+	8B7928D921F344BA006E9731 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 8BA05A660720730100365D66 /* Capacitor.cpp */;
-		name = "Capacitor.cpp: 238";
+		name = "Capacitor.cpp: 233";
 		rLen = 0;
-		rLoc = 10065;
+		rLoc = 9913;
 		rType = 0;
-		vrLen = 80;
-		vrLoc = 10017;
+		vrLen = 141;
+		vrLoc = 9914;
 	};
-	8B6692B61FB1BDCA007B3434 /* PBXTextBookmark */ = {
+	8B7928DE21F344CC006E9731 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 8BA05A660720730100365D66 /* Capacitor.cpp */;
-		name = "Capacitor.cpp: 238";
+		name = "Capacitor.cpp: 233";
 		rLen = 0;
-		rLoc = 10065;
+		rLoc = 9913;
 		rType = 0;
-		vrLen = 80;
-		vrLoc = 10017;
+		vrLen = 141;
+		vrLoc = 9914;
 	};
 	8BA05A660720730100365D66 /* Capacitor.cpp */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {544, 4628}}";
-			sepNavSelRange = "{10065, 0}";
-			sepNavVisRange = "{10017, 80}";
-			sepNavWindowFrame = "{{512, 39}, {923, 837}}";
+			sepNavIntBoundsRect = "{{0, 0}, {691, 4472}}";
+			sepNavSelRange = "{9913, 0}";
+			sepNavVisRange = "{9914, 141}";
+			sepNavWindowFrame = "{{401, 32}, {923, 837}}";
 		};
 	};
 	8BA05A690720730100365D66 /* CapacitorVersion.h */ = {
@@ -113,9 +113,9 @@
 	};
 	8BC6025B073B072D006C4272 /* Capacitor.h */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {894, 2158}}";
-			sepNavSelRange = "{5829, 65}";
-			sepNavVisRange = "{3949, 1667}";
+			sepNavIntBoundsRect = "{{0, 0}, {894, 2353}}";
+			sepNavSelRange = "{5854, 0}";
+			sepNavVisRange = "{4764, 1192}";
 			sepNavWindowFrame = "{{517, 41}, {923, 837}}";
 		};
 	};
diff --git a/plugins/MacAU/Capacitor/Capacitor.xcodeproj/christopherjohnson.perspectivev3 b/plugins/MacAU/Capacitor/Capacitor.xcodeproj/christopherjohnson.perspectivev3
index 53f7a19..079d4c2 100755
--- a/plugins/MacAU/Capacitor/Capacitor.xcodeproj/christopherjohnson.perspectivev3
+++ b/plugins/MacAU/Capacitor/Capacitor.xcodeproj/christopherjohnson.perspectivev3
@@ -225,8 +225,8 @@
 	<array/>
 	<key>PerspectiveWidths</key>
 	<array>
-		<integer>810</integer>
-		<integer>810</integer>
+		<integer>841</integer>
+		<integer>841</integer>
 	</array>
 	<key>Perspectives</key>
 	<array>
@@ -256,8 +256,6 @@
 			<key>Layout</key>
 			<array>
 				<dict>
-					<key>BecomeActive</key>
-					<true/>
 					<key>ContentConfiguration</key>
 					<dict>
 						<key>PBXBottomSmartGroupGIDs</key>
@@ -301,7 +299,7 @@
 							<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
 							<array>
 								<array>
-									<integer>4</integer>
+									<integer>3</integer>
 									<integer>2</integer>
 									<integer>1</integer>
 									<integer>0</integer>
@@ -325,7 +323,7 @@
 							<real>288</real>
 						</array>
 						<key>RubberWindowFrame</key>
-						<string>573 188 841 654 0 0 1440 878 </string>
+						<string>493 190 841 654 0 0 1440 878 </string>
 					</dict>
 					<key>Module</key>
 					<string>PBXSmartGroupTreeModule</string>
@@ -353,11 +351,11 @@
 										<key>_historyCapacity</key>
 										<integer>0</integer>
 										<key>bookmark</key>
-										<string>8B6692B61FB1BDCA007B3434</string>
+										<string>8B7928DE21F344CC006E9731</string>
 										<key>history</key>
 										<array>
 											<string>8B558E341E54FD3900D04D0B</string>
-											<string>8B6692B51FB1BDCA007B3434</string>
+											<string>8B7928D921F344BA006E9731</string>
 										</array>
 									</dict>
 									<key>SplitCount</key>
@@ -371,18 +369,18 @@
 							<key>GeometryConfiguration</key>
 							<dict>
 								<key>Frame</key>
-								<string>{{0, 0}, {531, 92}}</string>
+								<string>{{0, 0}, {531, 74}}</string>
 								<key>RubberWindowFrame</key>
-								<string>573 188 841 654 0 0 1440 878 </string>
+								<string>493 190 841 654 0 0 1440 878 </string>
 							</dict>
 							<key>Module</key>
 							<string>PBXNavigatorGroup</string>
 							<key>Proportion</key>
-							<string>92pt</string>
+							<string>74pt</string>
 						</dict>
 						<dict>
 							<key>Proportion</key>
-							<string>516pt</string>
+							<string>534pt</string>
 							<key>Tabs</key>
 							<array>
 								<dict>
@@ -396,9 +394,7 @@
 									<key>GeometryConfiguration</key>
 									<dict>
 										<key>Frame</key>
-										<string>{{10, 27}, {531, 489}}</string>
-										<key>RubberWindowFrame</key>
-										<string>573 188 841 654 0 0 1440 878 </string>
+										<string>{{10, 27}, {531, 507}}</string>
 									</dict>
 									<key>Module</key>
 									<string>XCDetailModule</string>
@@ -452,7 +448,9 @@
 									<key>GeometryConfiguration</key>
 									<dict>
 										<key>Frame</key>
-										<string>{{10, 31}, {603, 297}}</string>
+										<string>{{10, 27}, {531, 507}}</string>
+										<key>RubberWindowFrame</key>
+										<string>493 190 841 654 0 0 1440 878 </string>
 									</dict>
 									<key>Module</key>
 									<string>PBXBuildResultsModule</string>
@@ -480,11 +478,11 @@
 			</array>
 			<key>TableOfContents</key>
 			<array>
-				<string>8B6692B71FB1BDCA007B3434</string>
+				<string>8B7928DF21F344CC006E9731</string>
 				<string>1CA23ED40692098700951B8B</string>
-				<string>8B6692B81FB1BDCA007B3434</string>
+				<string>8B7928E021F344CC006E9731</string>
 				<string>8BD7274A1D46E5A5000176F0</string>
-				<string>8B6692B91FB1BDCA007B3434</string>
+				<string>8B7928E121F344CC006E9731</string>
 				<string>1CA23EDF0692099D00951B8B</string>
 				<string>1CA23EE00692099D00951B8B</string>
 				<string>1CA23EE10692099D00951B8B</string>
@@ -657,7 +655,7 @@
 	<key>StatusbarIsVisible</key>
 	<true/>
 	<key>TimeStamp</key>
-	<real>531742154.04575902</real>
+	<real>569590988.98670805</real>
 	<key>ToolbarConfigUserDefaultsMinorVersion</key>
 	<string>2</string>
 	<key>ToolbarDisplayMode</key>
@@ -674,11 +672,10 @@
 	<integer>5</integer>
 	<key>WindowOrderList</key>
 	<array>
-		<string>8B6692BA1FB1BDCA007B3434</string>
 		<string>/Users/christopherjohnson/Desktop/MacAU/Capacitor/Capacitor.xcodeproj</string>
 	</array>
 	<key>WindowString</key>
-	<string>573 188 841 654 0 0 1440 878 </string>
+	<string>493 190 841 654 0 0 1440 878 </string>
 	<key>WindowToolsV3</key>
 	<array>
 		<dict>