Floating Point Dither For All

6 files changed, 50 insertions, 68 deletions

diff --git a/plugins/MacAU/Acceleration/Acceleration.cpp b/plugins/MacAU/Acceleration/Acceleration.cpp
index d389d62..3fe259b 100644..100755
--- a/plugins/MacAU/Acceleration/Acceleration.cpp
+++ b/plugins/MacAU/Acceleration/Acceleration.cpp
@@ -170,9 +170,7 @@ void		Acceleration::AccelerationKernel::Reset()
 	s1L = s2L = s3L = 0.0;
 	o1L = o2L = o3L = 0.0;
 	m1L = m2L = desL = 0.0;
-	fpNShapeA = 0.0;
-	fpNShapeB = 0.0;
-	fpFlip = true;
+	fpNShape = 0.0;
 }
 
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -190,9 +188,6 @@ void		Acceleration::AccelerationKernel::Process(	const Float32 	*inSourceP,
 	long double overallscale = 1.0;
 	overallscale /= 44100.0;
 	overallscale *= GetSampleRate();
-	Float32 fpTemp;
-	long double fpOld = 0.618033988749894848204586; //golden ratio!
-	long double fpNew = 1.0 - fpOld;	
 
 	Float64 intensity = pow(GetParameter( kParam_One ),3)*(32/overallscale);
 	Float64 wet = GetParameter( kParam_Two );
@@ -262,19 +257,11 @@ void		Acceleration::AccelerationKernel::Process(	const Float32 	*inSourceP,
 		}
 		//Dry/Wet control, defaults to the last slider
 
-		//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/Acceleration/Acceleration.h b/plugins/MacAU/Acceleration/Acceleration.h
index 57d3b4b..ba5bfd4 100644..100755
--- a/plugins/MacAU/Acceleration/Acceleration.h
+++ b/plugins/MacAU/Acceleration/Acceleration.h
@@ -138,9 +138,7 @@ public:
 		Float64 m1L;
 		Float64 m2L;
 		Float64 desL;
-		long double fpNShapeA;
-		long double fpNShapeB;
-		bool fpFlip;
+		long double fpNShape;
 	};
 };
 
diff --git a/plugins/MacAU/Acceleration/Acceleration.xcodeproj/christopherjohnson.mode1v3 b/plugins/MacAU/Acceleration/Acceleration.xcodeproj/christopherjohnson.mode1v3
index f301be9..f301be9 100644..100755
--- a/plugins/MacAU/Acceleration/Acceleration.xcodeproj/christopherjohnson.mode1v3
+++ b/plugins/MacAU/Acceleration/Acceleration.xcodeproj/christopherjohnson.mode1v3
diff --git a/plugins/MacAU/Acceleration/Acceleration.xcodeproj/christopherjohnson.pbxuser b/plugins/MacAU/Acceleration/Acceleration.xcodeproj/christopherjohnson.pbxuser
index f49c30b..0c19d54 100644..100755
--- a/plugins/MacAU/Acceleration/Acceleration.xcodeproj/christopherjohnson.pbxuser
+++ b/plugins/MacAU/Acceleration/Acceleration.xcodeproj/christopherjohnson.pbxuser
@@ -49,28 +49,18 @@
 					PBXFileDataSource_Warnings_ColumnID,
 				);
 			};
-			PBXPerProjectTemplateStateSaveDate = 538705190;
-			PBXWorkspaceStateSaveDate = 538705190;
+			PBXPerProjectTemplateStateSaveDate = 569587589;
+			PBXWorkspaceStateSaveDate = 569587589;
 		};
 		perUserProjectItems = {
-			8B4E5812201C02EE00B5DC2A /* PBXTextBookmark */ = 8B4E5812201C02EE00B5DC2A /* PBXTextBookmark */;
 			8B6FC0BF20114A1C003CA5F7 /* PlistBookmark */ = 8B6FC0BF20114A1C003CA5F7 /* PlistBookmark */;
-			8B79CCF320114DBD00E8A187 /* PBXTextBookmark */ = 8B79CCF320114DBD00E8A187 /* PBXTextBookmark */;
+			8B79271221F3383E006E9731 /* PBXTextBookmark */ = 8B79271221F3383E006E9731 /* PBXTextBookmark */;
+			8B79271721F3384E006E9731 /* PBXTextBookmark */ = 8B79271721F3384E006E9731 /* PBXTextBookmark */;
 		};
 		sourceControlManager = 8BD3CCB8148830B20062E48C /* Source Control */;
 		userBuildSettings = {
 		};
 	};
-	8B4E5812201C02EE00B5DC2A /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 8BA05A660720730100365D66 /* Acceleration.cpp */;
-		name = "Acceleration.cpp: 239";
-		rLen = 0;
-		rLoc = 10522;
-		rType = 0;
-		vrLen = 447;
-		vrLoc = 10210;
-	};
 	8B6FC0BF20114A1C003CA5F7 /* PlistBookmark */ = {
 		isa = PlistBookmark;
 		fRef = 8D01CCD10486CAD60068D4B7 /* Info.plist */;
@@ -83,22 +73,32 @@
 		rLen = 0;
 		rLoc = 9223372036854775808;
 	};
-	8B79CCF320114DBD00E8A187 /* PBXTextBookmark */ = {
+	8B79271221F3383E006E9731 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 8BA05A660720730100365D66 /* Acceleration.cpp */;
+		name = "Acceleration.cpp: 234";
+		rLen = 0;
+		rLoc = 10370;
+		rType = 0;
+		vrLen = 269;
+		vrLoc = 10290;
+	};
+	8B79271721F3384E006E9731 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 8BA05A660720730100365D66 /* Acceleration.cpp */;
-		name = "Acceleration.cpp: 239";
+		name = "Acceleration.cpp: 234";
 		rLen = 0;
-		rLoc = 10522;
+		rLoc = 10370;
 		rType = 0;
-		vrLen = 488;
-		vrLoc = 10210;
+		vrLen = 269;
+		vrLoc = 10290;
 	};
 	8BA05A660720730100365D66 /* Acceleration.cpp */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {691, 3718}}";
-			sepNavSelRange = "{10522, 0}";
-			sepNavVisRange = "{10210, 447}";
-			sepNavWindowFrame = "{{537, 39}, {895, 839}}";
+			sepNavIntBoundsRect = "{{0, 0}, {684, 3666}}";
+			sepNavSelRange = "{10370, 0}";
+			sepNavVisRange = "{10290, 269}";
+			sepNavWindowFrame = "{{378, 39}, {895, 839}}";
 		};
 	};
 	8BA05A690720730100365D66 /* AccelerationVersion.h */ = {
@@ -111,10 +111,10 @@
 	};
 	8BC6025B073B072D006C4272 /* Acceleration.h */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {894, 1950}}";
-			sepNavSelRange = "{5229, 159}";
-			sepNavVisRange = "{1351, 2063}";
-			sepNavWindowFrame = "{{642, 39}, {895, 839}}";
+			sepNavIntBoundsRect = "{{0, 0}, {894, 1872}}";
+			sepNavSelRange = "{5413, 0}";
+			sepNavVisRange = "{3998, 1517}";
+			sepNavWindowFrame = "{{545, 39}, {895, 839}}";
 		};
 	};
 	8BD3CCB8148830B20062E48C /* Source Control */ = {
diff --git a/plugins/MacAU/Acceleration/Acceleration.xcodeproj/christopherjohnson.perspectivev3 b/plugins/MacAU/Acceleration/Acceleration.xcodeproj/christopherjohnson.perspectivev3
index 2851941..f284420 100644..100755
--- a/plugins/MacAU/Acceleration/Acceleration.xcodeproj/christopherjohnson.perspectivev3
+++ b/plugins/MacAU/Acceleration/Acceleration.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>583 224 841 654 0 0 1440 878 </string>
+						<string>354 224 841 654 0 0 1440 878 </string>
 					</dict>
 					<key>Module</key>
 					<string>PBXSmartGroupTreeModule</string>
@@ -354,11 +352,11 @@
 										<key>_historyCapacity</key>
 										<integer>0</integer>
 										<key>bookmark</key>
-										<string>8B4E5812201C02EE00B5DC2A</string>
+										<string>8B79271721F3384E006E9731</string>
 										<key>history</key>
 										<array>
 											<string>8B6FC0BF20114A1C003CA5F7</string>
-											<string>8B79CCF320114DBD00E8A187</string>
+											<string>8B79271221F3383E006E9731</string>
 										</array>
 									</dict>
 									<key>SplitCount</key>
@@ -372,18 +370,18 @@
 							<key>GeometryConfiguration</key>
 							<dict>
 								<key>Frame</key>
-								<string>{{0, 0}, {531, 202}}</string>
+								<string>{{0, 0}, {531, 188}}</string>
 								<key>RubberWindowFrame</key>
-								<string>583 224 841 654 0 0 1440 878 </string>
+								<string>354 224 841 654 0 0 1440 878 </string>
 							</dict>
 							<key>Module</key>
 							<string>PBXNavigatorGroup</string>
 							<key>Proportion</key>
-							<string>202pt</string>
+							<string>188pt</string>
 						</dict>
 						<dict>
 							<key>Proportion</key>
-							<string>406pt</string>
+							<string>420pt</string>
 							<key>Tabs</key>
 							<array>
 								<dict>
@@ -397,9 +395,7 @@
 									<key>GeometryConfiguration</key>
 									<dict>
 										<key>Frame</key>
-										<string>{{10, 27}, {531, 379}}</string>
-										<key>RubberWindowFrame</key>
-										<string>583 224 841 654 0 0 1440 878 </string>
+										<string>{{10, 27}, {531, 393}}</string>
 									</dict>
 									<key>Module</key>
 									<string>XCDetailModule</string>
@@ -453,7 +449,9 @@
 									<key>GeometryConfiguration</key>
 									<dict>
 										<key>Frame</key>
-										<string>{{10, 27}, {531, 339}}</string>
+										<string>{{10, 27}, {531, 393}}</string>
+										<key>RubberWindowFrame</key>
+										<string>354 224 841 654 0 0 1440 878 </string>
 									</dict>
 									<key>Module</key>
 									<string>PBXBuildResultsModule</string>
@@ -481,11 +479,11 @@
 			</array>
 			<key>TableOfContents</key>
 			<array>
-				<string>8B4E5813201C02EE00B5DC2A</string>
+				<string>8B79271821F3384E006E9731</string>
 				<string>1CA23ED40692098700951B8B</string>
-				<string>8B4E5814201C02EE00B5DC2A</string>
+				<string>8B79271921F3384E006E9731</string>
 				<string>8BD7274A1D46E5A5000176F0</string>
-				<string>8B4E5815201C02EE00B5DC2A</string>
+				<string>8B79271A21F3384E006E9731</string>
 				<string>1CA23EDF0692099D00951B8B</string>
 				<string>1CA23EE00692099D00951B8B</string>
 				<string>1CA23EE10692099D00951B8B</string>
@@ -658,7 +656,7 @@
 	<key>StatusbarIsVisible</key>
 	<true/>
 	<key>TimeStamp</key>
-	<real>538706670.20774806</real>
+	<real>569587790.455778</real>
 	<key>ToolbarConfigUserDefaultsMinorVersion</key>
 	<string>2</string>
 	<key>ToolbarDisplayMode</key>
@@ -675,11 +673,10 @@
 	<integer>5</integer>
 	<key>WindowOrderList</key>
 	<array>
-		<string>8B4E5816201C02EE00B5DC2A</string>
 		<string>/Users/christopherjohnson/Desktop/MacAU/Acceleration/Acceleration.xcodeproj</string>
 	</array>
 	<key>WindowString</key>
-	<string>583 224 841 654 0 0 1440 878 </string>
+	<string>354 224 841 654 0 0 1440 878 </string>
 	<key>WindowToolsV3</key>
 	<array>
 		<dict>
diff --git a/plugins/MacAU/Acceleration/Acceleration.xcodeproj/project.pbxproj b/plugins/MacAU/Acceleration/Acceleration.xcodeproj/project.pbxproj
index 7755ccf..7755ccf 100644..100755
--- a/plugins/MacAU/Acceleration/Acceleration.xcodeproj/project.pbxproj
+++ b/plugins/MacAU/Acceleration/Acceleration.xcodeproj/project.pbxproj