Floating Point Dither For All

3 files changed, 63 insertions, 72 deletions

diff --git a/plugins/MacVST/Spiral2/Spiral2.xcodeproj/christopherjohnson.pbxuser b/plugins/MacVST/Spiral2/Spiral2.xcodeproj/christopherjohnson.pbxuser
index 998d404..73c6829 100755
--- a/plugins/MacVST/Spiral2/Spiral2.xcodeproj/christopherjohnson.pbxuser
+++ b/plugins/MacVST/Spiral2/Spiral2.xcodeproj/christopherjohnson.pbxuser
@@ -49,12 +49,12 @@
 					PBXFileDataSource_Warnings_ColumnID,
 				);
 			};
-			PBXPerProjectTemplateStateSaveDate = 553978416;
-			PBXWorkspaceStateSaveDate = 553978416;
+			PBXPerProjectTemplateStateSaveDate = 569772566;
+			PBXWorkspaceStateSaveDate = 569772566;
 		};
 		perUserProjectItems = {
-			8BBD182B21050DB30015A233 /* PBXBookmark */ = 8BBD182B21050DB30015A233 /* PBXBookmark */;
-			8BBD1834210525AC0015A233 /* XCBuildMessageTextBookmark */ = 8BBD1834210525AC0015A233 /* XCBuildMessageTextBookmark */;
+			8B79404021F60A24006E9731 /* PBXTextBookmark */ = 8B79404021F60A24006E9731 /* PBXTextBookmark */;
+			8B79404421F60A24006E9731 /* PBXTextBookmark */ = 8B79404421F60A24006E9731 /* PBXTextBookmark */;
 			8BBD1835210525AC0015A233 /* PBXTextBookmark */ = 8BBD1835210525AC0015A233 /* PBXTextBookmark */;
 			8BBD1838210525AC0015A233 /* PBXTextBookmark */ = 8BBD1838210525AC0015A233 /* PBXTextBookmark */;
 		};
@@ -80,17 +80,17 @@
 	};
 	24A2FFDB0F90D1DD003BB5A7 /* audioeffectx.cpp */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {838, 19747}}";
+			sepNavIntBoundsRect = "{{0, 0}, {838, 19877}}";
 			sepNavSelRange = "{10616, 0}";
-			sepNavVisRange = "{10459, 399}";
+			sepNavVisRange = "{10459, 280}";
 			sepNavWindowFrame = "{{15, 42}, {895, 831}}";
 		};
 	};
 	24D8286F09A914000093AEF8 /* Spiral2Proc.cpp */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {866, 3913}}";
+			sepNavIntBoundsRect = "{{0, 0}, {866, 3497}}";
 			sepNavSelRange = "{8913, 0}";
-			sepNavVisRange = "{6147, 2094}";
+			sepNavVisRange = "{3322, 1681}";
 			sepNavWindowFrame = "{{18, 47}, {895, 831}}";
 		};
 	};
@@ -108,18 +108,25 @@
 		isa = PBXCodeSenseManager;
 		indexTemplatePath = "";
 	};
-	8BBD182B21050DB30015A233 /* PBXBookmark */ = {
-		isa = PBXBookmark;
-		fRef = 24D8286F09A914000093AEF8 /* Spiral2Proc.cpp */;
-	};
-	8BBD1834210525AC0015A233 /* XCBuildMessageTextBookmark */ = {
+	8B79404021F60A24006E9731 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
-		comments = "Deprecated conversion from string constant to 'char*'";
 		fRef = 24A2FFDB0F90D1DD003BB5A7 /* audioeffectx.cpp */;
-		fallbackIsa = XCBuildMessageTextBookmark;
-		rLen = 1;
-		rLoc = 306;
-		rType = 1;
+		name = "audioeffectx.cpp: 307";
+		rLen = 0;
+		rLoc = 10616;
+		rType = 0;
+		vrLen = 280;
+		vrLoc = 10459;
+	};
+	8B79404421F60A24006E9731 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 24D8286F09A914000093AEF8 /* Spiral2Proc.cpp */;
+		name = "Spiral2Proc.cpp: 260";
+		rLen = 0;
+		rLoc = 8913;
+		rType = 0;
+		vrLen = 1681;
+		vrLoc = 3322;
 	};
 	8BBD1835210525AC0015A233 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
diff --git a/plugins/MacVST/Spiral2/Spiral2.xcodeproj/christopherjohnson.perspectivev3 b/plugins/MacVST/Spiral2/Spiral2.xcodeproj/christopherjohnson.perspectivev3
index 376de96..08c20ea 100755
--- a/plugins/MacVST/Spiral2/Spiral2.xcodeproj/christopherjohnson.perspectivev3
+++ b/plugins/MacVST/Spiral2/Spiral2.xcodeproj/christopherjohnson.perspectivev3
@@ -241,10 +241,10 @@
 						<key>_historyCapacity</key>
 						<integer>0</integer>
 						<key>bookmark</key>
-						<string>8BBD1838210525AC0015A233</string>
+						<string>8B79404421F60A24006E9731</string>
 						<key>history</key>
 						<array>
-							<string>8BBD182B21050DB30015A233</string>
+							<string>8BBD1838210525AC0015A233</string>
 						</array>
 					</dict>
 					<key>SplitCount</key>
@@ -297,6 +297,8 @@
 			<key>Layout</key>
 			<array>
 				<dict>
+					<key>BecomeActive</key>
+					<true/>
 					<key>ContentConfiguration</key>
 					<dict>
 						<key>PBXBottomSmartGroupGIDs</key>
@@ -362,7 +364,7 @@
 							<real>185</real>
 						</array>
 						<key>RubberWindowFrame</key>
-						<string>5 340 810 487 0 0 1440 878 </string>
+						<string>432 361 810 487 0 0 1440 878 </string>
 					</dict>
 					<key>Module</key>
 					<string>PBXSmartGroupTreeModule</string>
@@ -390,10 +392,10 @@
 										<key>_historyCapacity</key>
 										<integer>0</integer>
 										<key>bookmark</key>
-										<string>8BBD1835210525AC0015A233</string>
+										<string>8B79404021F60A24006E9731</string>
 										<key>history</key>
 										<array>
-											<string>8BBD1834210525AC0015A233</string>
+											<string>8BBD1835210525AC0015A233</string>
 										</array>
 									</dict>
 									<key>SplitCount</key>
@@ -407,18 +409,18 @@
 							<key>GeometryConfiguration</key>
 							<dict>
 								<key>Frame</key>
-								<string>{{0, 0}, {603, 132}}</string>
+								<string>{{0, 0}, {603, 117}}</string>
 								<key>RubberWindowFrame</key>
-								<string>5 340 810 487 0 0 1440 878 </string>
+								<string>432 361 810 487 0 0 1440 878 </string>
 							</dict>
 							<key>Module</key>
 							<string>PBXNavigatorGroup</string>
 							<key>Proportion</key>
-							<string>132pt</string>
+							<string>117pt</string>
 						</dict>
 						<dict>
 							<key>Proportion</key>
-							<string>309pt</string>
+							<string>324pt</string>
 							<key>Tabs</key>
 							<array>
 								<dict>
@@ -432,7 +434,9 @@
 									<key>GeometryConfiguration</key>
 									<dict>
 										<key>Frame</key>
-										<string>{{10, 27}, {603, 414}}</string>
+										<string>{{10, 27}, {603, 297}}</string>
+										<key>RubberWindowFrame</key>
+										<string>432 361 810 487 0 0 1440 878 </string>
 									</dict>
 									<key>Module</key>
 									<string>XCDetailModule</string>
@@ -487,8 +491,6 @@
 									<dict>
 										<key>Frame</key>
 										<string>{{10, 27}, {603, 282}}</string>
-										<key>RubberWindowFrame</key>
-										<string>5 340 810 487 0 0 1440 878 </string>
 									</dict>
 									<key>Module</key>
 									<string>PBXBuildResultsModule</string>
@@ -516,11 +518,11 @@
 			</array>
 			<key>TableOfContents</key>
 			<array>
-				<string>8BBD181021050A370015A233</string>
+				<string>8B79404121F60A24006E9731</string>
 				<string>1CA23ED40692098700951B8B</string>
-				<string>8BBD181121050A370015A233</string>
+				<string>8B79404221F60A24006E9731</string>
 				<string>8B0237581D42B1C400E1E8C8</string>
-				<string>8BBD181221050A370015A233</string>
+				<string>8B79404321F60A24006E9731</string>
 				<string>1CA23EDF0692099D00951B8B</string>
 				<string>1CA23EE00692099D00951B8B</string>
 				<string>1CA23EE10692099D00951B8B</string>
@@ -673,7 +675,7 @@
 	<key>StatusbarIsVisible</key>
 	<true/>
 	<key>TimeStamp</key>
-	<real>553985452.30988598</real>
+	<real>569772580.33098996</real>
 	<key>ToolbarConfigUserDefaultsMinorVersion</key>
 	<string>2</string>
 	<key>ToolbarDisplayMode</key>
@@ -691,10 +693,10 @@
 	<key>WindowOrderList</key>
 	<array>
 		<string>8BBD1836210525AC0015A233</string>
-		<string>/Users/christopherjohnson/Desktop/Spiral2/Spiral2.xcodeproj</string>
+		<string>/Users/christopherjohnson/Desktop/MacVST/Spiral2/Spiral2.xcodeproj</string>
 	</array>
 	<key>WindowString</key>
-	<string>5 340 810 487 0 0 1440 878 </string>
+	<string>432 361 810 487 0 0 1440 878 </string>
 	<key>WindowToolsV3</key>
 	<array>
 		<dict>
diff --git a/plugins/MacVST/Spiral2/source/Spiral2Proc.cpp b/plugins/MacVST/Spiral2/source/Spiral2Proc.cpp
index d309448..a8669c5 100755
--- a/plugins/MacVST/Spiral2/source/Spiral2Proc.cpp
+++ b/plugins/MacVST/Spiral2/source/Spiral2Proc.cpp
@@ -118,18 +118,14 @@ void Spiral2::processReplacing(float **inputs, float **outputs, VstInt32 sampleF
 		prevSampleR = drySampleR;
 		flip = !flip;
 		
-		//noise shaping to 32-bit floating point
-		float fpTemp = inputSampleL;
-		fpNShapeL += (inputSampleL-fpTemp);
-		inputSampleL += fpNShapeL;
-		//if this confuses you look at the wordlength for fpTemp :)
-		fpTemp = inputSampleR;
-		fpNShapeR += (inputSampleR-fpTemp);
-		inputSampleR += fpNShapeR;
-		//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
+		//stereo 32 bit dither, made small and tidy.
+		int expon; frexpf((float)inputSampleL, &expon);
+		long double dither = (rand()/(RAND_MAX*7.737125245533627e+25))*pow(2,expon+62);
+		inputSampleL += (dither-fpNShapeL); fpNShapeL = dither;
+		frexpf((float)inputSampleR, &expon);
+		dither = (rand()/(RAND_MAX*7.737125245533627e+25))*pow(2,expon+62);
+		inputSampleR += (dither-fpNShapeR); fpNShapeR = dither;
+		//end 32 bit dither
 		
 		*out1 = inputSampleL;
 		*out2 = inputSampleR;
@@ -139,12 +135,6 @@ void Spiral2::processReplacing(float **inputs, float **outputs, VstInt32 sampleF
 		*out1++;
 		*out2++;
     }
-	fpNShapeL *= 0.999999;
-	fpNShapeR *= 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.	
 }
 
 void Spiral2::processDoubleReplacing(double **inputs, double **outputs, VstInt32 sampleFrames) 
@@ -259,18 +249,16 @@ void Spiral2::processDoubleReplacing(double **inputs, double **outputs, VstInt32
 		prevSampleR = drySampleR;
 		flip = !flip;
 		
-		//noise shaping to 64-bit floating point
-		double fpTemp = inputSampleL;
-		fpNShapeL += (inputSampleL-fpTemp);
-		inputSampleL += fpNShapeL;
-		//if this confuses you look at the wordlength for fpTemp :)
-		fpTemp = inputSampleR;
-		fpNShapeR += (inputSampleR-fpTemp);
-		inputSampleR += fpNShapeR;
-		//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 64 bit output
+		//stereo 64 bit dither, made small and tidy.
+		int expon; frexp((double)inputSampleL, &expon);
+		long double dither = (rand()/(RAND_MAX*7.737125245533627e+25))*pow(2,expon+62);
+		dither /= 536870912.0; //needs this to scale to 64 bit zone
+		inputSampleL += (dither-fpNShapeL); fpNShapeL = dither;
+		frexp((double)inputSampleR, &expon);
+		dither = (rand()/(RAND_MAX*7.737125245533627e+25))*pow(2,expon+62);
+		dither /= 536870912.0; //needs this to scale to 64 bit zone
+		inputSampleR += (dither-fpNShapeR); fpNShapeR = dither;
+		//end 64 bit dither
 		
 		*out1 = inputSampleL;
 		*out2 = inputSampleR;
@@ -280,10 +268,4 @@ void Spiral2::processDoubleReplacing(double **inputs, double **outputs, VstInt32
 		*out1++;
 		*out2++;
     }
-	fpNShapeL *= 0.999999;
-	fpNShapeR *= 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.	
 }