Floating Point Dither For All

4 files changed, 47 insertions, 69 deletions

diff --git a/plugins/MacAU/NonlinearSpace/NonlinearSpace.cpp b/plugins/MacAU/NonlinearSpace/NonlinearSpace.cpp
index 4c11ff3..d91e997 100755
--- a/plugins/MacAU/NonlinearSpace/NonlinearSpace.cpp
+++ b/plugins/MacAU/NonlinearSpace/NonlinearSpace.cpp
@@ -408,11 +408,8 @@ ComponentResult		NonlinearSpace::Reset(AudioUnitScope inScope, AudioUnitElement
 	countdown = -1;
 	flip = true;
 	
-	fpNShapeAL = 0.0;
-	fpNShapeBL = 0.0;
-	fpNShapeAR = 0.0;
-	fpNShapeBR = 0.0;
-	fpFlip = true;
+	fpNShapeL = 0.0;
+	fpNShapeR = 0.0;
 	return noErr;
 }
 
@@ -430,9 +427,6 @@ OSStatus		NonlinearSpace::ProcessBufferLists(AudioUnitRenderActionFlags & ioActi
 	Float32 * inputR = (Float32*)(inBuffer.mBuffers[1].mData);
 	Float32 * outputL = (Float32*)(outBuffer.mBuffers[0].mData);
 	Float32 * outputR = (Float32*)(outBuffer.mBuffers[1].mData);
-	Float32 fpTemp;
-	Float64 fpOld = 0.618033988749894848204586; //golden ratio!
-	Float64 fpNew = 1.0 - fpOld;
 	UInt32 nSampleFrames = inFramesToProcess;
 	long double drySampleL;
 	long double drySampleR;
@@ -1161,25 +1155,14 @@ OSStatus		NonlinearSpace::ProcessBufferLists(AudioUnitRenderActionFlags & ioActi
 		drySampleR += inputSampleR;
 		//here we combine the tanks with the dry signal
 		
-		//noise shaping to 32-bit floating point
-		if (fpFlip) {
-			fpTemp = drySampleL;
-			fpNShapeAL = (fpNShapeAL*fpOld)+((drySampleL-fpTemp)*fpNew);
-			drySampleL += fpNShapeAL;
-			fpTemp = drySampleR;
-			fpNShapeAR = (fpNShapeAR*fpOld)+((drySampleR-fpTemp)*fpNew);
-			drySampleR += fpNShapeAR;
-		}
-		else {
-			fpTemp = drySampleL;
-			fpNShapeBL = (fpNShapeBL*fpOld)+((drySampleL-fpTemp)*fpNew);
-			drySampleL += fpNShapeBL;
-			fpTemp = drySampleR;
-			fpNShapeBR = (fpNShapeBR*fpOld)+((drySampleR-fpTemp)*fpNew);
-			drySampleR += fpNShapeBR;
-		}
-		fpFlip = !fpFlip;
-		//end noise shaping on 32 bit output
+		//stereo 32 bit dither, made small and tidy.
+		int expon; frexpf((Float32)inputSampleL, &expon);
+		long double dither = (rand()/(RAND_MAX*7.737125245533627e+25))*pow(2,expon+62);
+		inputSampleL += (dither-fpNShapeL); fpNShapeL = dither;
+		frexpf((Float32)inputSampleR, &expon);
+		dither = (rand()/(RAND_MAX*7.737125245533627e+25))*pow(2,expon+62);
+		inputSampleR += (dither-fpNShapeR); fpNShapeR = dither;
+		//end 32 bit dither
 		flip = !flip;
 		
 		*outputL = drySampleL;
diff --git a/plugins/MacAU/NonlinearSpace/NonlinearSpace.h b/plugins/MacAU/NonlinearSpace/NonlinearSpace.h
index 4e1fa8c..2c9b3d0 100755
--- a/plugins/MacAU/NonlinearSpace/NonlinearSpace.h
+++ b/plugins/MacAU/NonlinearSpace/NonlinearSpace.h
@@ -293,12 +293,8 @@ private:
 	
 	Float64 nonlin;
 	
-	
-	Float64 fpNShapeAL;
-	Float64 fpNShapeAR;
-	Float64 fpNShapeBL;
-	Float64 fpNShapeBR;	
-	bool fpFlip;
+	Float64 fpNShapeR;
+	Float64 fpNShapeL;
 	
 };
 
diff --git a/plugins/MacAU/NonlinearSpace/NonlinearSpace.xcodeproj/christopherjohnson.pbxuser b/plugins/MacAU/NonlinearSpace/NonlinearSpace.xcodeproj/christopherjohnson.pbxuser
index 3db0ed1..2fc6ea7 100755
--- a/plugins/MacAU/NonlinearSpace/NonlinearSpace.xcodeproj/christopherjohnson.pbxuser
+++ b/plugins/MacAU/NonlinearSpace/NonlinearSpace.xcodeproj/christopherjohnson.pbxuser
@@ -49,28 +49,28 @@
 					PBXFileDataSource_Warnings_ColumnID,
 				);
 			};
-			PBXPerProjectTemplateStateSaveDate = 541885687;
-			PBXWorkspaceStateSaveDate = 541885687;
+			PBXPerProjectTemplateStateSaveDate = 569651447;
+			PBXWorkspaceStateSaveDate = 569651447;
 		};
 		perUserProjectItems = {
-			8B18199D204B916F00516BEE /* PBXTextBookmark */ = 8B18199D204B916F00516BEE /* PBXTextBookmark */;
-			8B181A99204C8C0B00516BEE /* PBXTextBookmark */ = 8B181A99204C8C0B00516BEE /* PBXTextBookmark */;
+			8B792E5721F4316F006E9731 /* PBXTextBookmark */ = 8B792E5721F4316F006E9731 /* PBXTextBookmark */;
+			8B792E5D21F4318F006E9731 /* PBXTextBookmark */ = 8B792E5D21F4318F006E9731 /* PBXTextBookmark */;
 		};
 		sourceControlManager = 8BD3CCB8148830B20062E48C /* Source Control */;
 		userBuildSettings = {
 		};
 	};
-	8B18199D204B916F00516BEE /* PBXTextBookmark */ = {
+	8B792E5721F4316F006E9731 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 8BA05A690720730100365D66 /* NonlinearSpaceVersion.h */;
 		name = "NonlinearSpaceVersion.h: 54";
 		rLen = 0;
 		rLoc = 2930;
 		rType = 0;
-		vrLen = 291;
-		vrLoc = 2693;
+		vrLen = 242;
+		vrLoc = 2742;
 	};
-	8B181A99204C8C0B00516BEE /* PBXTextBookmark */ = {
+	8B792E5D21F4318F006E9731 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 8BA05A690720730100365D66 /* NonlinearSpaceVersion.h */;
 		name = "NonlinearSpaceVersion.h: 54";
@@ -82,10 +82,10 @@
 	};
 	8BA05A660720730100365D66 /* NonlinearSpace.cpp */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {950, 15535}}";
-			sepNavSelRange = "{48346, 16}";
-			sepNavVisRange = "{47066, 1488}";
-			sepNavWindowFrame = "{{443, 40}, {997, 838}}";
+			sepNavIntBoundsRect = "{{0, 0}, {1020, 15964}}";
+			sepNavSelRange = "{16757, 0}";
+			sepNavVisRange = "{15636, 1745}";
+			sepNavWindowFrame = "{{278, 40}, {997, 838}}";
 		};
 	};
 	8BA05A670720730100365D66 /* NonlinearSpace.exp */ = {
@@ -97,7 +97,7 @@
 	};
 	8BA05A690720730100365D66 /* NonlinearSpaceVersion.h */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {803, 897}}";
+			sepNavIntBoundsRect = "{{0, 0}, {803, 910}}";
 			sepNavSelRange = "{2930, 0}";
 			sepNavVisRange = "{2742, 242}";
 			sepNavWindowFrame = "{{15, 40}, {997, 838}}";
@@ -105,9 +105,9 @@
 	};
 	8BC6025B073B072D006C4272 /* NonlinearSpace.h */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {950, 4004}}";
-			sepNavSelRange = "{3309, 0}";
-			sepNavVisRange = "{9015, 1297}";
+			sepNavIntBoundsRect = "{{0, 0}, {950, 4446}}";
+			sepNavSelRange = "{10101, 0}";
+			sepNavVisRange = "{8847, 1404}";
 			sepNavWindowFrame = "{{443, 40}, {997, 838}}";
 		};
 	};
diff --git a/plugins/MacAU/NonlinearSpace/NonlinearSpace.xcodeproj/christopherjohnson.perspectivev3 b/plugins/MacAU/NonlinearSpace/NonlinearSpace.xcodeproj/christopherjohnson.perspectivev3
index 71cc409..93eb68c 100755
--- a/plugins/MacAU/NonlinearSpace/NonlinearSpace.xcodeproj/christopherjohnson.perspectivev3
+++ b/plugins/MacAU/NonlinearSpace/NonlinearSpace.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>605 353 810 487 0 0 1440 878 </string>
+						<string>474 350 810 487 0 0 1440 878 </string>
 					</dict>
 					<key>Module</key>
 					<string>PBXSmartGroupTreeModule</string>
@@ -352,10 +350,10 @@
 										<key>_historyCapacity</key>
 										<integer>0</integer>
 										<key>bookmark</key>
-										<string>8B181A99204C8C0B00516BEE</string>
+										<string>8B792E5D21F4318F006E9731</string>
 										<key>history</key>
 										<array>
-											<string>8B18199D204B916F00516BEE</string>
+											<string>8B792E5721F4316F006E9731</string>
 										</array>
 									</dict>
 									<key>SplitCount</key>
@@ -369,18 +367,18 @@
 							<key>GeometryConfiguration</key>
 							<dict>
 								<key>Frame</key>
-								<string>{{0, 0}, {603, 117}}</string>
+								<string>{{0, 0}, {603, 102}}</string>
 								<key>RubberWindowFrame</key>
-								<string>605 353 810 487 0 0 1440 878 </string>
+								<string>474 350 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>
@@ -394,9 +392,7 @@
 									<key>GeometryConfiguration</key>
 									<dict>
 										<key>Frame</key>
-										<string>{{10, 27}, {603, 297}}</string>
-										<key>RubberWindowFrame</key>
-										<string>605 353 810 487 0 0 1440 878 </string>
+										<string>{{10, 27}, {603, 312}}</string>
 									</dict>
 									<key>Module</key>
 									<string>XCDetailModule</string>
@@ -450,7 +446,9 @@
 									<key>GeometryConfiguration</key>
 									<dict>
 										<key>Frame</key>
-										<string>{{10, 31}, {603, 297}}</string>
+										<string>{{10, 27}, {603, 312}}</string>
+										<key>RubberWindowFrame</key>
+										<string>474 350 810 487 0 0 1440 878 </string>
 									</dict>
 									<key>Module</key>
 									<string>PBXBuildResultsModule</string>
@@ -478,11 +476,11 @@
 			</array>
 			<key>TableOfContents</key>
 			<array>
-				<string>8B181A9A204C8C0B00516BEE</string>
+				<string>8B792E5E21F4318F006E9731</string>
 				<string>1CA23ED40692098700951B8B</string>
-				<string>8B181A9B204C8C0B00516BEE</string>
+				<string>8B792E5F21F4318F006E9731</string>
 				<string>8BCA70082027EAB800D92BAD</string>
-				<string>8B181A9C204C8C0B00516BEE</string>
+				<string>8B792E6021F4318F006E9731</string>
 				<string>1CA23EDF0692099D00951B8B</string>
 				<string>1CA23EE00692099D00951B8B</string>
 				<string>1CA23EE10692099D00951B8B</string>
@@ -635,7 +633,7 @@
 	<key>StatusbarIsVisible</key>
 	<true/>
 	<key>TimeStamp</key>
-	<real>541887499.900267</real>
+	<real>569651599.64848602</real>
 	<key>ToolbarConfigUserDefaultsMinorVersion</key>
 	<string>2</string>
 	<key>ToolbarDisplayMode</key>
@@ -652,10 +650,11 @@
 	<integer>5</integer>
 	<key>WindowOrderList</key>
 	<array>
+		<string>8B792E6121F4318F006E9731</string>
 		<string>/Users/christopherjohnson/Desktop/MacAU/NonlinearSpace/NonlinearSpace.xcodeproj</string>
 	</array>
 	<key>WindowString</key>
-	<string>605 353 810 487 0 0 1440 878 </string>
+	<string>474 350 810 487 0 0 1440 878 </string>
 	<key>WindowToolsV3</key>
 	<array>
 		<dict>