Floating Point Dither For All

4 files changed, 56 insertions, 66 deletions

diff --git a/plugins/MacAU/Energy/Energy.cpp b/plugins/MacAU/Energy/Energy.cpp
index e3b3354..3e9d4cb 100755
--- a/plugins/MacAU/Energy/Energy.cpp
+++ b/plugins/MacAU/Energy/Energy.cpp
@@ -733,22 +733,14 @@ void		Energy::EnergyKernel::Process(	const Float32 	*inSourceP,
 		//we don't need a drySample because we never touched inputSample
 		//so, this provides the inv/dry/wet control all by itself
 		
-		//noise shaping to 32-bit floating point
-		Float32 fpTemp = inputSample;
-		fpNShape += (inputSample-fpTemp);
-		inputSample += fpNShape;
-		//for deeper space and warmth, we try a non-oscillating noise shaping
-		//that is kind of ruthless: it will forever retain the rounding errors
-		//except we'll dial it back a hair at the end of every buffer processed
-		//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;
 		
 		sourceP += inNumChannels; destP += inNumChannels;
 	}
-	fpNShape *= 0.999999;
-	//we will just delicately dial back the FP noise shaping, not even every sample
-	//this is a good place to put subtle 'no runaway' calculations, though bear in mind
-	//that it will be called more often when you use shorter sample buffers in the DAW.
-	//So, very low latency operation will call these calculations more often.
 }
\ No newline at end of file
diff --git a/plugins/MacAU/Energy/Energy.h b/plugins/MacAU/Energy/Energy.h
index 2ea7b28..62648f2 100755
--- a/plugins/MacAU/Energy/Energy.h
+++ b/plugins/MacAU/Energy/Energy.h
@@ -225,7 +225,7 @@ public:
 		Float64 PrevB;
 		Float64 PrevA;
 
-		Float64 fpNShape;
+		long double fpNShape;
 
 	};
 };
diff --git a/plugins/MacAU/Energy/Energy.xcodeproj/christopherjohnson.pbxuser b/plugins/MacAU/Energy/Energy.xcodeproj/christopherjohnson.pbxuser
index 4d5f878..ea6a47e 100755
--- a/plugins/MacAU/Energy/Energy.xcodeproj/christopherjohnson.pbxuser
+++ b/plugins/MacAU/Energy/Energy.xcodeproj/christopherjohnson.pbxuser
@@ -49,19 +49,39 @@
 					PBXFileDataSource_Warnings_ColumnID,
 				);
 			};
-			PBXPerProjectTemplateStateSaveDate = 547787625;
-			PBXWorkspaceStateSaveDate = 547787625;
+			PBXPerProjectTemplateStateSaveDate = 569602677;
+			PBXWorkspaceStateSaveDate = 569602677;
 		};
 		perUserProjectItems = {
+			8B792BCC21F372B8006E9731 /* PBXTextBookmark */ = 8B792BCC21F372B8006E9731 /* PBXTextBookmark */;
+			8B792BD121F372CE006E9731 /* PBXTextBookmark */ = 8B792BD121F372CE006E9731 /* PBXTextBookmark */;
 			8B7E3EE120A720D100482CB5 /* PBXTextBookmark */ = 8B7E3EE120A720D100482CB5 /* PBXTextBookmark */;
 			8B7E3EE220A720D100482CB5 /* PBXTextBookmark */ = 8B7E3EE220A720D100482CB5 /* PBXTextBookmark */;
-			8B7E3EE320A720D100482CB5 /* PBXTextBookmark */ = 8B7E3EE320A720D100482CB5 /* PBXTextBookmark */;
-			8B7E3EE420A720D100482CB5 /* PBXTextBookmark */ = 8B7E3EE420A720D100482CB5 /* PBXTextBookmark */;
 		};
 		sourceControlManager = 8BD3CCB8148830B20062E48C /* Source Control */;
 		userBuildSettings = {
 		};
 	};
+	8B792BCC21F372B8006E9731 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 8BC6025B073B072D006C4272 /* Energy.h */;
+		name = "Energy.h: 229";
+		rLen = 0;
+		rLoc = 7165;
+		rType = 0;
+		vrLen = 64;
+		vrLoc = 7106;
+	};
+	8B792BD121F372CE006E9731 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 8BC6025B073B072D006C4272 /* Energy.h */;
+		name = "Energy.h: 229";
+		rLen = 0;
+		rLoc = 7165;
+		rType = 0;
+		vrLen = 64;
+		vrLoc = 7106;
+	};
 	8B7E3EE120A720D100482CB5 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 8BA05A660720730100365D66 /* Energy.cpp */;
@@ -82,32 +102,12 @@
 		vrLen = 265;
 		vrLoc = 3189;
 	};
-	8B7E3EE320A720D100482CB5 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 8BC6025B073B072D006C4272 /* Energy.h */;
-		name = "Energy.h: 229";
-		rLen = 0;
-		rLoc = 7161;
-		rType = 0;
-		vrLen = 63;
-		vrLoc = 7106;
-	};
-	8B7E3EE420A720D100482CB5 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 8BC6025B073B072D006C4272 /* Energy.h */;
-		name = "Energy.h: 229";
-		rLen = 0;
-		rLoc = 7161;
-		rType = 0;
-		vrLen = 63;
-		vrLoc = 7106;
-	};
 	8BA05A660720730100365D66 /* Energy.cpp */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {740, 10985}}";
-			sepNavSelRange = "{13885, 8875}";
-			sepNavVisRange = "{22057, 1537}";
-			sepNavWindowFrame = "{{653, 65}, {787, 813}}";
+			sepNavIntBoundsRect = "{{0, 0}, {740, 10309}}";
+			sepNavSelRange = "{23013, 0}";
+			sepNavVisRange = "{21843, 1256}";
+			sepNavWindowFrame = "{{504, 65}, {787, 813}}";
 		};
 	};
 	8BA05A670720730100365D66 /* Energy.exp */ = {
@@ -128,10 +128,10 @@
 	};
 	8BC6025B073B072D006C4272 /* Energy.h */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {656, 3263}}";
-			sepNavSelRange = "{7161, 0}";
-			sepNavVisRange = "{7106, 63}";
-			sepNavWindowFrame = "{{796, 53}, {863, 813}}";
+			sepNavIntBoundsRect = "{{0, 0}, {656, 3211}}";
+			sepNavSelRange = "{7165, 0}";
+			sepNavVisRange = "{7106, 64}";
+			sepNavWindowFrame = "{{577, 53}, {863, 813}}";
 		};
 	};
 	8BD3CCB8148830B20062E48C /* Source Control */ = {
diff --git a/plugins/MacAU/Energy/Energy.xcodeproj/christopherjohnson.perspectivev3 b/plugins/MacAU/Energy/Energy.xcodeproj/christopherjohnson.perspectivev3
index b8eeb52..951b9b4 100755
--- a/plugins/MacAU/Energy/Energy.xcodeproj/christopherjohnson.perspectivev3
+++ b/plugins/MacAU/Energy/Energy.xcodeproj/christopherjohnson.perspectivev3
@@ -225,8 +225,8 @@
 	<array/>
 	<key>PerspectiveWidths</key>
 	<array>
-		<integer>-1</integer>
-		<integer>-1</integer>
+		<integer>810</integer>
+		<integer>810</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>
@@ -324,7 +322,7 @@
 							<real>185</real>
 						</array>
 						<key>RubberWindowFrame</key>
-						<string>618 342 810 487 0 0 1440 878 </string>
+						<string>475 322 810 487 0 0 1440 878 </string>
 					</dict>
 					<key>Module</key>
 					<string>PBXSmartGroupTreeModule</string>
@@ -352,12 +350,12 @@
 										<key>_historyCapacity</key>
 										<integer>0</integer>
 										<key>bookmark</key>
-										<string>8B7E3EE420A720D100482CB5</string>
+										<string>8B792BD121F372CE006E9731</string>
 										<key>history</key>
 										<array>
 											<string>8B7E3EE120A720D100482CB5</string>
 											<string>8B7E3EE220A720D100482CB5</string>
-											<string>8B7E3EE320A720D100482CB5</string>
+											<string>8B792BCC21F372B8006E9731</string>
 										</array>
 									</dict>
 									<key>SplitCount</key>
@@ -371,18 +369,18 @@
 							<key>GeometryConfiguration</key>
 							<dict>
 								<key>Frame</key>
-								<string>{{0, 0}, {603, 117}}</string>
+								<string>{{0, 0}, {603, 102}}</string>
 								<key>RubberWindowFrame</key>
-								<string>618 342 810 487 0 0 1440 878 </string>
+								<string>475 322 810 487 0 0 1440 878 </string>
 							</dict>
 							<key>Module</key>
 							<string>PBXNavigatorGroup</string>
 							<key>Proportion</key>
-							<string>117pt</string>
+							<string>102pt</string>
 						</dict>
 						<dict>
 							<key>Proportion</key>
-							<string>324pt</string>
+							<string>339pt</string>
 							<key>Tabs</key>
 							<array>
 								<dict>
@@ -396,9 +394,7 @@
 									<key>GeometryConfiguration</key>
 									<dict>
 										<key>Frame</key>
-										<string>{{10, 27}, {603, 297}}</string>
-										<key>RubberWindowFrame</key>
-										<string>618 342 810 487 0 0 1440 878 </string>
+										<string>{{10, 27}, {603, 312}}</string>
 									</dict>
 									<key>Module</key>
 									<string>XCDetailModule</string>
@@ -452,7 +448,9 @@
 									<key>GeometryConfiguration</key>
 									<dict>
 										<key>Frame</key>
-										<string>{{10, 27}, {603, 282}}</string>
+										<string>{{10, 27}, {603, 312}}</string>
+										<key>RubberWindowFrame</key>
+										<string>475 322 810 487 0 0 1440 878 </string>
 									</dict>
 									<key>Module</key>
 									<string>PBXBuildResultsModule</string>
@@ -480,11 +478,11 @@
 			</array>
 			<key>TableOfContents</key>
 			<array>
-				<string>8B7E3EE520A720D100482CB5</string>
+				<string>8B792BD221F372CE006E9731</string>
 				<string>1CA23ED40692098700951B8B</string>
-				<string>8B7E3EE620A720D100482CB5</string>
+				<string>8B792BD321F372CE006E9731</string>
 				<string>8B7E3C2F20A5148000482CB5</string>
-				<string>8B7E3EE720A720D100482CB5</string>
+				<string>8B792BD421F372CE006E9731</string>
 				<string>1CA23EDF0692099D00951B8B</string>
 				<string>1CA23EE00692099D00951B8B</string>
 				<string>1CA23EE10692099D00951B8B</string>
@@ -637,7 +635,7 @@
 	<key>StatusbarIsVisible</key>
 	<true/>
 	<key>TimeStamp</key>
-	<real>547823825.49813604</real>
+	<real>569602766.40819299</real>
 	<key>ToolbarConfigUserDefaultsMinorVersion</key>
 	<string>2</string>
 	<key>ToolbarDisplayMode</key>
@@ -657,7 +655,7 @@
 		<string>/Users/christopherjohnson/Desktop/MacAU/Energy/Energy.xcodeproj</string>
 	</array>
 	<key>WindowString</key>
-	<string>618 342 810 487 0 0 1440 878 </string>
+	<string>475 322 810 487 0 0 1440 878 </string>
 	<key>WindowToolsV3</key>
 	<array>
 		<dict>