Floating Point Dither For All

4 files changed, 40 insertions, 66 deletions

diff --git a/plugins/MacAU/ChorusEnsemble/ChorusEnsemble.cpp b/plugins/MacAU/ChorusEnsemble/ChorusEnsemble.cpp
index 8caed8c..4cc8f36 100755
--- a/plugins/MacAU/ChorusEnsemble/ChorusEnsemble.cpp
+++ b/plugins/MacAU/ChorusEnsemble/ChorusEnsemble.cpp
@@ -181,9 +181,8 @@ void		ChorusEnsemble::ChorusEnsembleKernel::Reset()
 	airEven = 0.0;
 	airOdd = 0.0;
 	airFactor = 0.0;
-	fpNShapeA = 0.0;
-	fpNShapeB = 0.0;
-	fpFlip = true;
+	fpNShape = 0.0;
+	fpFlip = false;
 }
 
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -215,10 +214,6 @@ void		ChorusEnsemble::ChorusEnsembleKernel::Process(	const Float32 	*inSourceP,
 	Float64 offset;
 	Float64 start[4];
 	
-	Float32 fpTemp;
-	long double fpOld = 0.618033988749894848204586; //golden ratio!
-	long double fpNew = 1.0 - fpOld;	
-	
 	long double inputSample;
 	Float64 drySample;
 	//now we'll precalculate some stuff that needn't be in every sample
@@ -312,19 +307,11 @@ void		ChorusEnsemble::ChorusEnsembleKernel::Process(	const Float32 	*inSourceP,
 			inputSample = (inputSample * wet) + (drySample * dry);
 		}
 		
-		//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;
 		destP += inNumChannels;
diff --git a/plugins/MacAU/ChorusEnsemble/ChorusEnsemble.h b/plugins/MacAU/ChorusEnsemble/ChorusEnsemble.h
index 6b2b8ed..7012d58 100755
--- a/plugins/MacAU/ChorusEnsemble/ChorusEnsemble.h
+++ b/plugins/MacAU/ChorusEnsemble/ChorusEnsemble.h
@@ -139,9 +139,8 @@ public:
 		Float64 airEven;
 		Float64 airOdd;
 		Float64 airFactor;
-		long double fpNShapeA;
-		long double fpNShapeB;
-		bool fpFlip;		
+		long double fpNShape;
+		bool fpFlip;
 	};
 };
 
diff --git a/plugins/MacAU/ChorusEnsemble/ChorusEnsemble.xcodeproj/christopherjohnson.pbxuser b/plugins/MacAU/ChorusEnsemble/ChorusEnsemble.xcodeproj/christopherjohnson.pbxuser
index 338f1c0..6b1f825 100755
--- a/plugins/MacAU/ChorusEnsemble/ChorusEnsemble.xcodeproj/christopherjohnson.pbxuser
+++ b/plugins/MacAU/ChorusEnsemble/ChorusEnsemble.xcodeproj/christopherjohnson.pbxuser
@@ -49,61 +49,50 @@
 					PBXFileDataSource_Warnings_ColumnID,
 				);
 			};
-			PBXPerProjectTemplateStateSaveDate = 528421453;
-			PBXWorkspaceStateSaveDate = 528421453;
+			PBXPerProjectTemplateStateSaveDate = 569591494;
+			PBXWorkspaceStateSaveDate = 569591494;
 		};
 		perUserProjectItems = {
+			8B79294D21F34765006E9731 /* PBXTextBookmark */ = 8B79294D21F34765006E9731 /* PBXTextBookmark */;
 			8B8847291F206D6800E13453 /* PBXTextBookmark */ = 8B8847291F206D6800E13453 /* PBXTextBookmark */;
-			8B88472A1F206D6800E13453 /* PBXTextBookmark */ = 8B88472A1F206D6800E13453 /* PBXTextBookmark */;
-			8B9D734E1F7F1296007AB60F /* PBXTextBookmark */ = 8B9D734E1F7F1296007AB60F /* PBXTextBookmark */;
 		};
 		sourceControlManager = 8BD3CCB8148830B20062E48C /* Source Control */;
 		userBuildSettings = {
 		};
 	};
-	8B8847291F206D6800E13453 /* PBXTextBookmark */ = {
+	8B79294D21F34765006E9731 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 8BA05A670720730100365D66 /* ChorusEnsemble.exp */;
 		name = "ChorusEnsemble.exp: 2";
 		rLen = 0;
 		rLoc = 21;
 		rType = 0;
-		vrLen = 21;
+		vrLen = 0;
 		vrLoc = 0;
 	};
-	8B88472A1F206D6800E13453 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 8BC6025B073B072D006C4272 /* ChorusEnsemble.h */;
-		name = "ChorusEnsemble.h: 58";
-		rLen = 0;
-		rLoc = 2939;
-		rType = 0;
-		vrLen = 239;
-		vrLoc = 2754;
-	};
-	8B9D734E1F7F1296007AB60F /* PBXTextBookmark */ = {
+	8B8847291F206D6800E13453 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
-		fRef = 8BC6025B073B072D006C4272 /* ChorusEnsemble.h */;
-		name = "ChorusEnsemble.h: 58";
+		fRef = 8BA05A670720730100365D66 /* ChorusEnsemble.exp */;
+		name = "ChorusEnsemble.exp: 2";
 		rLen = 0;
-		rLoc = 2939;
+		rLoc = 21;
 		rType = 0;
-		vrLen = 0;
+		vrLen = 21;
 		vrLoc = 0;
 	};
 	8BA05A660720730100365D66 /* ChorusEnsemble.cpp */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {521, 4407}}";
-			sepNavSelRange = "{11914, 0}";
-			sepNavVisRange = "{0, 0}";
-			sepNavWindowFrame = "{{295, 65}, {1145, 812}}";
+			sepNavIntBoundsRect = "{{0, 0}, {1098, 4368}}";
+			sepNavSelRange = "{8495, 0}";
+			sepNavVisRange = "{7989, 1986}";
+			sepNavWindowFrame = "{{147, 42}, {1145, 812}}";
 		};
 	};
 	8BA05A670720730100365D66 /* ChorusEnsemble.exp */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {554, 100}}";
+			sepNavIntBoundsRect = "{{0, 0}, {521, 26}}";
 			sepNavSelRange = "{21, 0}";
-			sepNavVisRange = "{0, 21}";
+			sepNavVisRange = "{0, 0}";
 			sepNavWindowFrame = "{{15, 39}, {1005, 839}}";
 		};
 	};
@@ -117,7 +106,7 @@
 	};
 	8BC6025B073B072D006C4272 /* ChorusEnsemble.h */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {719, 2197}}";
+			sepNavIntBoundsRect = "{{0, 0}, {521, 1937}}";
 			sepNavSelRange = "{2939, 0}";
 			sepNavVisRange = "{0, 0}";
 			sepNavWindowFrame = "{{435, 39}, {1005, 839}}";
diff --git a/plugins/MacAU/ChorusEnsemble/ChorusEnsemble.xcodeproj/christopherjohnson.perspectivev3 b/plugins/MacAU/ChorusEnsemble/ChorusEnsemble.xcodeproj/christopherjohnson.perspectivev3
index 71d07ef..d35aa7f 100755
--- a/plugins/MacAU/ChorusEnsemble/ChorusEnsemble.xcodeproj/christopherjohnson.perspectivev3
+++ b/plugins/MacAU/ChorusEnsemble/ChorusEnsemble.xcodeproj/christopherjohnson.perspectivev3
@@ -326,7 +326,7 @@
 							<real>218</real>
 						</array>
 						<key>RubberWindowFrame</key>
-						<string>616 217 810 487 0 0 1440 878 </string>
+						<string>457 305 810 487 0 0 1440 878 </string>
 					</dict>
 					<key>Module</key>
 					<string>PBXSmartGroupTreeModule</string>
@@ -342,7 +342,7 @@
 								<key>PBXProjectModuleGUID</key>
 								<string>8B8847271F206D6800E13453</string>
 								<key>PBXProjectModuleLabel</key>
-								<string>ChorusEnsemble.h</string>
+								<string>ChorusEnsemble.exp</string>
 								<key>PBXSplitModuleInNavigatorKey</key>
 								<dict>
 									<key>Split0</key>
@@ -350,15 +350,14 @@
 										<key>PBXProjectModuleGUID</key>
 										<string>8B8847281F206D6800E13453</string>
 										<key>PBXProjectModuleLabel</key>
-										<string>ChorusEnsemble.h</string>
+										<string>ChorusEnsemble.exp</string>
 										<key>_historyCapacity</key>
 										<integer>0</integer>
 										<key>bookmark</key>
-										<string>8B9D734E1F7F1296007AB60F</string>
+										<string>8B79294D21F34765006E9731</string>
 										<key>history</key>
 										<array>
 											<string>8B8847291F206D6800E13453</string>
-											<string>8B88472A1F206D6800E13453</string>
 										</array>
 									</dict>
 									<key>SplitCount</key>
@@ -374,7 +373,7 @@
 								<key>Frame</key>
 								<string>{{0, 0}, {570, 0}}</string>
 								<key>RubberWindowFrame</key>
-								<string>616 217 810 487 0 0 1440 878 </string>
+								<string>457 305 810 487 0 0 1440 878 </string>
 							</dict>
 							<key>Module</key>
 							<string>PBXNavigatorGroup</string>
@@ -398,8 +397,6 @@
 									<dict>
 										<key>Frame</key>
 										<string>{{10, 27}, {570, 414}}</string>
-										<key>RubberWindowFrame</key>
-										<string>616 217 810 487 0 0 1440 878 </string>
 									</dict>
 									<key>Module</key>
 									<string>XCDetailModule</string>
@@ -453,7 +450,9 @@
 									<key>GeometryConfiguration</key>
 									<dict>
 										<key>Frame</key>
-										<string>{{10, 27}, {570, 312}}</string>
+										<string>{{10, 27}, {570, 414}}</string>
+										<key>RubberWindowFrame</key>
+										<string>457 305 810 487 0 0 1440 878 </string>
 									</dict>
 									<key>Module</key>
 									<string>PBXBuildResultsModule</string>
@@ -481,11 +480,11 @@
 			</array>
 			<key>TableOfContents</key>
 			<array>
-				<string>8B9D734F1F7F1296007AB60F</string>
+				<string>8B79294E21F34765006E9731</string>
 				<string>1CA23ED40692098700951B8B</string>
-				<string>8B9D73501F7F1296007AB60F</string>
+				<string>8B79294F21F34765006E9731</string>
 				<string>8B8847271F206D6800E13453</string>
-				<string>8B9D73511F7F1296007AB60F</string>
+				<string>8B79295021F34765006E9731</string>
 				<string>1CA23EDF0692099D00951B8B</string>
 				<string>1CA23EE00692099D00951B8B</string>
 				<string>1CA23EE10692099D00951B8B</string>
@@ -638,7 +637,7 @@
 	<key>StatusbarIsVisible</key>
 	<true/>
 	<key>TimeStamp</key>
-	<real>528421526.378672</real>
+	<real>569591653.62024701</real>
 	<key>ToolbarConfigUserDefaultsMinorVersion</key>
 	<string>2</string>
 	<key>ToolbarDisplayMode</key>
@@ -655,11 +654,11 @@
 	<integer>5</integer>
 	<key>WindowOrderList</key>
 	<array>
-		<string>8B9D73521F7F1296007AB60F</string>
+		<string>8B79295121F34765006E9731</string>
 		<string>/Users/christopherjohnson/Desktop/MacAU/ChorusEnsemble/ChorusEnsemble.xcodeproj</string>
 	</array>
 	<key>WindowString</key>
-	<string>616 217 810 487 0 0 1440 878 </string>
+	<string>457 305 810 487 0 0 1440 878 </string>
 	<key>WindowToolsV3</key>
 	<array>
 		<dict>