Floating Point Dither For All

4 files changed, 99 insertions, 61 deletions

diff --git a/plugins/MacAU/Average/Average.cpp b/plugins/MacAU/Average/Average.cpp
index 200aafa..d2ee078 100755
--- a/plugins/MacAU/Average/Average.cpp
+++ b/plugins/MacAU/Average/Average.cpp
@@ -170,9 +170,7 @@ void		Average::AverageKernel::Reset()
 {
 	register UInt32 count;
 	for(count = 0; count < 11; count++) {b[count] = 0.0; f[count] = 0.0;}
-	fpNShapeA = 0.0;
-	fpNShapeB = 0.0;
-	fpFlip = true;
+	fpNShape = 0.0;
 }
 
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -221,10 +219,6 @@ void		Average::AverageKernel::Process(	const Float32 	*inSourceP,
 	f[9] /= overallscale;
 	//and now it's neatly scaled, too
 
-	Float32 fpTemp;
-	Float64 fpOld = 0.618033988749894848204586; //golden ratio!
-	Float64 fpNew = 1.0 - fpOld;
-	
 	while (nSampleFrames-- > 0) {
 		inputSample = *sourceP;
 		if (inputSample<1.2e-38 && -inputSample<1.2e-38) {
@@ -285,19 +279,11 @@ void		Average::AverageKernel::Process(	const Float32 	*inSourceP,
 		//if it 'won't change anything' but our sample might be at a very different scaling
 		//in the floating point system.
 		
-		//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/Average/Average.h b/plugins/MacAU/Average/Average.h
index a1d8e88..3ff5e3d 100755
--- a/plugins/MacAU/Average/Average.h
+++ b/plugins/MacAU/Average/Average.h
@@ -131,10 +131,7 @@ public:
 	private: 
 		Float64 b[11];
 		Float64 f[11];		
-		Float64 fpNShapeA;
-		Float64 fpNShapeB;
-		bool fpFlip;
-		
+		Float64 fpNShape;
 	};
 };
 
diff --git a/plugins/MacAU/Average/Average.xcodeproj/christopherjohnson.pbxuser b/plugins/MacAU/Average/Average.xcodeproj/christopherjohnson.pbxuser
index 59f35a8..cf424d9 100755
--- a/plugins/MacAU/Average/Average.xcodeproj/christopherjohnson.pbxuser
+++ b/plugins/MacAU/Average/Average.xcodeproj/christopherjohnson.pbxuser
@@ -49,18 +49,44 @@
 					PBXFileDataSource_Warnings_ColumnID,
 				);
 			};
-			PBXPerProjectTemplateStateSaveDate = 557438773;
-			PBXWorkspaceStateSaveDate = 557438773;
+			PBXPerProjectTemplateStateSaveDate = 569589188;
+			PBXWorkspaceStateSaveDate = 569589188;
 		};
 		perUserProjectItems = {
+			8B7927DA21F33DD5006E9731 /* PBXBookmark */ = 8B7927DA21F33DD5006E9731 /* PBXBookmark */;
+			8B7927E321F33E0C006E9731 /* PBXTextBookmark */ = 8B7927E321F33E0C006E9731 /* PBXTextBookmark */;
+			8B7927E921F33E0C006E9731 /* PBXTextBookmark */ = 8B7927E921F33E0C006E9731 /* PBXTextBookmark */;
 			8B7BA53D1DAD4A33007C127E /* PBXTextBookmark */ = 8B7BA53D1DAD4A33007C127E /* PBXTextBookmark */;
-			8B9D72C51F7F1129007AB60F /* PBXTextBookmark */ = 8B9D72C51F7F1129007AB60F /* PBXTextBookmark */;
 			8BFDB0072139DDE90079F90D /* PBXTextBookmark */ = 8BFDB0072139DDE90079F90D /* PBXTextBookmark */;
 		};
 		sourceControlManager = 8BD3CCB8148830B20062E48C /* Source Control */;
 		userBuildSettings = {
 		};
 	};
+	8B7927DA21F33DD5006E9731 /* PBXBookmark */ = {
+		isa = PBXBookmark;
+		fRef = 8BA05A660720730100365D66 /* Average.cpp */;
+	};
+	8B7927E321F33E0C006E9731 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 8BA05A660720730100365D66 /* Average.cpp */;
+		name = "Average.cpp: 294";
+		rLen = 0;
+		rLoc = 13108;
+		rType = 0;
+		vrLen = 0;
+		vrLoc = 0;
+	};
+	8B7927E921F33E0C006E9731 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 8BA05A660720730100365D66 /* Average.cpp */;
+		name = "Average.cpp: 222";
+		rLen = 0;
+		rLoc = 9886;
+		rType = 0;
+		vrLen = 2433;
+		vrLoc = 8388;
+	};
 	8B7BA53D1DAD4A33007C127E /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 8BC6025B073B072D006C4272 /* Average.h */;
@@ -71,22 +97,12 @@
 		vrLen = 248;
 		vrLoc = 2963;
 	};
-	8B9D72C51F7F1129007AB60F /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 8BA05A660720730100365D66 /* Average.cpp */;
-		name = "Average.cpp: 308";
-		rLen = 0;
-		rLoc = 13372;
-		rType = 0;
-		vrLen = 0;
-		vrLoc = 0;
-	};
 	8BA05A660720730100365D66 /* Average.cpp */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {554, 4082}}";
-			sepNavSelRange = "{13372, 0}";
+			sepNavIntBoundsRect = "{{0, 0}, {554, 4004}}";
+			sepNavSelRange = "{13108, 0}";
 			sepNavVisRange = "{0, 0}";
-			sepNavWindowFrame = "{{531, 39}, {909, 838}}";
+			sepNavWindowFrame = "{{360, 40}, {909, 838}}";
 		};
 	};
 	8BA05A690720730100365D66 /* AverageVersion.h */ = {
@@ -99,10 +115,10 @@
 	};
 	8BC6025B073B072D006C4272 /* Average.h */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1200, 1872}}";
-			sepNavSelRange = "{3020, 54}";
-			sepNavVisRange = "{3923, 1499}";
-			sepNavWindowFrame = "{{446, 61}, {1247, 817}}";
+			sepNavIntBoundsRect = "{{0, 0}, {1200, 1807}}";
+			sepNavSelRange = "{5274, 0}";
+			sepNavVisRange = "{3744, 1632}";
+			sepNavWindowFrame = "{{193, 61}, {1247, 817}}";
 		};
 	};
 	8BD3CCB8148830B20062E48C /* Source Control */ = {
@@ -124,7 +140,7 @@
 		fRef = 8BA05A660720730100365D66 /* Average.cpp */;
 		name = "Average.cpp: 308";
 		rLen = 0;
-		rLoc = 13372;
+		rLoc = 13108;
 		rType = 0;
 		vrLen = 0;
 		vrLoc = 0;
diff --git a/plugins/MacAU/Average/Average.xcodeproj/christopherjohnson.perspectivev3 b/plugins/MacAU/Average/Average.xcodeproj/christopherjohnson.perspectivev3
index cd90e95..e7dddb3 100755
--- a/plugins/MacAU/Average/Average.xcodeproj/christopherjohnson.perspectivev3
+++ b/plugins/MacAU/Average/Average.xcodeproj/christopherjohnson.perspectivev3
@@ -222,7 +222,48 @@
 		</dict>
 	</array>
 	<key>OpenEditors</key>
-	<array/>
+	<array>
+		<dict>
+			<key>Content</key>
+			<dict>
+				<key>PBXProjectModuleGUID</key>
+				<string>8B7927E721F33E0C006E9731</string>
+				<key>PBXProjectModuleLabel</key>
+				<string>Average.cpp</string>
+				<key>PBXSplitModuleInNavigatorKey</key>
+				<dict>
+					<key>Split0</key>
+					<dict>
+						<key>PBXProjectModuleGUID</key>
+						<string>8B7927E821F33E0C006E9731</string>
+						<key>PBXProjectModuleLabel</key>
+						<string>Average.cpp</string>
+						<key>_historyCapacity</key>
+						<integer>0</integer>
+						<key>bookmark</key>
+						<string>8B7927E921F33E0C006E9731</string>
+						<key>history</key>
+						<array>
+							<string>8B7927DA21F33DD5006E9731</string>
+						</array>
+					</dict>
+					<key>SplitCount</key>
+					<string>1</string>
+				</dict>
+				<key>StatusBarVisibility</key>
+				<true/>
+			</dict>
+			<key>Geometry</key>
+			<dict>
+				<key>Frame</key>
+				<string>{{0, 20}, {909, 741}}</string>
+				<key>PBXModuleWindowStatusBarHidden2</key>
+				<false/>
+				<key>RubberWindowFrame</key>
+				<string>360 96 909 782 0 0 1440 878 </string>
+			</dict>
+		</dict>
+	</array>
 	<key>PerspectiveWidths</key>
 	<array>
 		<integer>810</integer>
@@ -256,8 +297,6 @@
 			<key>Layout</key>
 			<array>
 				<dict>
-					<key>BecomeActive</key>
-					<true/>
 					<key>ContentConfiguration</key>
 					<dict>
 						<key>PBXBottomSmartGroupGIDs</key>
@@ -324,7 +363,7 @@
 							<real>185</real>
 						</array>
 						<key>RubberWindowFrame</key>
-						<string>612 196 810 487 0 0 1440 878 </string>
+						<string>456 228 810 487 0 0 1440 878 </string>
 					</dict>
 					<key>Module</key>
 					<string>PBXSmartGroupTreeModule</string>
@@ -352,11 +391,11 @@
 										<key>_historyCapacity</key>
 										<integer>0</integer>
 										<key>bookmark</key>
-										<string>8BFDB0072139DDE90079F90D</string>
+										<string>8B7927E321F33E0C006E9731</string>
 										<key>history</key>
 										<array>
 											<string>8B7BA53D1DAD4A33007C127E</string>
-											<string>8B9D72C51F7F1129007AB60F</string>
+											<string>8BFDB0072139DDE90079F90D</string>
 										</array>
 									</dict>
 									<key>SplitCount</key>
@@ -372,7 +411,7 @@
 								<key>Frame</key>
 								<string>{{0, 0}, {603, 0}}</string>
 								<key>RubberWindowFrame</key>
-								<string>612 196 810 487 0 0 1440 878 </string>
+								<string>456 228 810 487 0 0 1440 878 </string>
 							</dict>
 							<key>Module</key>
 							<string>PBXNavigatorGroup</string>
@@ -396,8 +435,6 @@
 									<dict>
 										<key>Frame</key>
 										<string>{{10, 27}, {603, 414}}</string>
-										<key>RubberWindowFrame</key>
-										<string>612 196 810 487 0 0 1440 878 </string>
 									</dict>
 									<key>Module</key>
 									<string>XCDetailModule</string>
@@ -451,7 +488,9 @@
 									<key>GeometryConfiguration</key>
 									<dict>
 										<key>Frame</key>
-										<string>{{10, 27}, {603, 297}}</string>
+										<string>{{10, 27}, {603, 414}}</string>
+										<key>RubberWindowFrame</key>
+										<string>456 228 810 487 0 0 1440 878 </string>
 									</dict>
 									<key>Module</key>
 									<string>PBXBuildResultsModule</string>
@@ -479,11 +518,11 @@
 			</array>
 			<key>TableOfContents</key>
 			<array>
-				<string>8BFDB0082139DDE90079F90D</string>
+				<string>8B7927E421F33E0C006E9731</string>
 				<string>1CA23ED40692098700951B8B</string>
-				<string>8BFDB0092139DDE90079F90D</string>
+				<string>8B7927E521F33E0C006E9731</string>
 				<string>8B9E5A3F1DAAD3C800A9546F</string>
-				<string>8BFDB00A2139DDE90079F90D</string>
+				<string>8B7927E621F33E0C006E9731</string>
 				<string>1CA23EDF0692099D00951B8B</string>
 				<string>1CA23EE00692099D00951B8B</string>
 				<string>1CA23EE10692099D00951B8B</string>
@@ -636,7 +675,7 @@
 	<key>StatusbarIsVisible</key>
 	<true/>
 	<key>TimeStamp</key>
-	<real>557440489.96798897</real>
+	<real>569589260.26626098</real>
 	<key>ToolbarConfigUserDefaultsMinorVersion</key>
 	<string>2</string>
 	<key>ToolbarDisplayMode</key>
@@ -653,11 +692,11 @@
 	<integer>5</integer>
 	<key>WindowOrderList</key>
 	<array>
-		<string>8BFDB00B2139DDE90079F90D</string>
+		<string>8B7927E721F33E0C006E9731</string>
 		<string>/Users/christopherjohnson/Desktop/MacAU/Average/Average.xcodeproj</string>
 	</array>
 	<key>WindowString</key>
-	<string>612 196 810 487 0 0 1440 878 </string>
+	<string>456 228 810 487 0 0 1440 878 </string>
 	<key>WindowToolsV3</key>
 	<array>
 		<dict>