Floating Point Dither For All

3 files changed, 40 insertions, 58 deletions

diff --git a/plugins/MacVST/TapeDelay/TapeDelay.xcodeproj/christopherjohnson.pbxuser b/plugins/MacVST/TapeDelay/TapeDelay.xcodeproj/christopherjohnson.pbxuser
index c5631ab..c3bc4aa 100755
--- a/plugins/MacVST/TapeDelay/TapeDelay.xcodeproj/christopherjohnson.pbxuser
+++ b/plugins/MacVST/TapeDelay/TapeDelay.xcodeproj/christopherjohnson.pbxuser
@@ -51,11 +51,11 @@
 					PBXFileDataSource_Warnings_ColumnID,
 				);
 			};
-			PBXPerProjectTemplateStateSaveDate = 566515719;
-			PBXWorkspaceStateSaveDate = 566515719;
+			PBXPerProjectTemplateStateSaveDate = 569772961;
+			PBXWorkspaceStateSaveDate = 569772961;
 		};
 		perUserProjectItems = {
-			8BBB336F21C45BB700825986 /* PBXTextBookmark */ = 8BBB336F21C45BB700825986 /* PBXTextBookmark */;
+			8B79412621F60BA9006E9731 /* PBXTextBookmark */ = 8B79412621F60BA9006E9731 /* PBXTextBookmark */;
 			8BBB337021C45BB700825986 /* PBXTextBookmark */ = 8BBB337021C45BB700825986 /* PBXTextBookmark */;
 		};
 		sourceControlManager = 8B02375E1D42B1C400E1E8C8 /* Source Control */;
@@ -64,9 +64,9 @@
 	};
 	2407DEB6089929BA00EB68BF /* TapeDelay.cpp */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {789, 2093}}";
+			sepNavIntBoundsRect = "{{0, 0}, {789, 2054}}";
 			sepNavSelRange = "{5754, 0}";
-			sepNavVisRange = "{4829, 428}";
+			sepNavVisRange = "{4902, 355}";
 			sepNavWindowFrame = "{{561, 47}, {895, 831}}";
 		};
 	};
@@ -108,15 +108,15 @@
 		isa = PBXCodeSenseManager;
 		indexTemplatePath = "";
 	};
-	8BBB336F21C45BB700825986 /* PBXTextBookmark */ = {
+	8B79412621F60BA9006E9731 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 2407DEB6089929BA00EB68BF /* TapeDelay.cpp */;
 		name = "TapeDelay.cpp: 147";
 		rLen = 0;
 		rLoc = 5754;
 		rType = 0;
-		vrLen = 428;
-		vrLoc = 4829;
+		vrLen = 355;
+		vrLoc = 4902;
 	};
 	8BBB337021C45BB700825986 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
diff --git a/plugins/MacVST/TapeDelay/TapeDelay.xcodeproj/christopherjohnson.perspectivev3 b/plugins/MacVST/TapeDelay/TapeDelay.xcodeproj/christopherjohnson.perspectivev3
index 65a91fc..98c0fc3 100755
--- a/plugins/MacVST/TapeDelay/TapeDelay.xcodeproj/christopherjohnson.perspectivev3
+++ b/plugins/MacVST/TapeDelay/TapeDelay.xcodeproj/christopherjohnson.perspectivev3
@@ -323,7 +323,7 @@
 							<real>185</real>
 						</array>
 						<key>RubberWindowFrame</key>
-						<string>670 293 810 487 0 0 1440 878 </string>
+						<string>574 298 810 487 0 0 1440 878 </string>
 					</dict>
 					<key>Module</key>
 					<string>PBXSmartGroupTreeModule</string>
@@ -351,10 +351,10 @@
 										<key>_historyCapacity</key>
 										<integer>0</integer>
 										<key>bookmark</key>
-										<string>8BBB337021C45BB700825986</string>
+										<string>8B79412621F60BA9006E9731</string>
 										<key>history</key>
 										<array>
-											<string>8BBB336F21C45BB700825986</string>
+											<string>8BBB337021C45BB700825986</string>
 										</array>
 									</dict>
 									<key>SplitCount</key>
@@ -368,18 +368,18 @@
 							<key>GeometryConfiguration</key>
 							<dict>
 								<key>Frame</key>
-								<string>{{0, 0}, {603, 102}}</string>
+								<string>{{0, 0}, {603, 86}}</string>
 								<key>RubberWindowFrame</key>
-								<string>670 293 810 487 0 0 1440 878 </string>
+								<string>574 298 810 487 0 0 1440 878 </string>
 							</dict>
 							<key>Module</key>
 							<string>PBXNavigatorGroup</string>
 							<key>Proportion</key>
-							<string>102pt</string>
+							<string>86pt</string>
 						</dict>
 						<dict>
 							<key>Proportion</key>
-							<string>339pt</string>
+							<string>355pt</string>
 							<key>Tabs</key>
 							<array>
 								<dict>
@@ -393,9 +393,9 @@
 									<key>GeometryConfiguration</key>
 									<dict>
 										<key>Frame</key>
-										<string>{{10, 27}, {603, 312}}</string>
+										<string>{{10, 27}, {603, 328}}</string>
 										<key>RubberWindowFrame</key>
-										<string>670 293 810 487 0 0 1440 878 </string>
+										<string>574 298 810 487 0 0 1440 878 </string>
 									</dict>
 									<key>Module</key>
 									<string>XCDetailModule</string>
@@ -477,11 +477,11 @@
 			</array>
 			<key>TableOfContents</key>
 			<array>
-				<string>8BBB337121C45BB700825986</string>
+				<string>8B79412721F60BA9006E9731</string>
 				<string>1CA23ED40692098700951B8B</string>
-				<string>8BBB337221C45BB700825986</string>
+				<string>8B79412821F60BA9006E9731</string>
 				<string>8B0237581D42B1C400E1E8C8</string>
-				<string>8BBB337321C45BB700825986</string>
+				<string>8B79412921F60BA9006E9731</string>
 				<string>1CA23EDF0692099D00951B8B</string>
 				<string>1CA23EE00692099D00951B8B</string>
 				<string>1CA23EE10692099D00951B8B</string>
@@ -654,7 +654,7 @@
 	<key>StatusbarIsVisible</key>
 	<true/>
 	<key>TimeStamp</key>
-	<real>566516663.29121006</real>
+	<real>569772969.46289504</real>
 	<key>ToolbarConfigUserDefaultsMinorVersion</key>
 	<string>2</string>
 	<key>ToolbarDisplayMode</key>
@@ -674,7 +674,7 @@
 		<string>/Users/christopherjohnson/Desktop/MacVST/TapeDelay/TapeDelay.xcodeproj</string>
 	</array>
 	<key>WindowString</key>
-	<string>670 293 810 487 0 0 1440 878 </string>
+	<string>574 298 810 487 0 0 1440 878 </string>
 	<key>WindowToolsV3</key>
 	<array>
 		<dict>
diff --git a/plugins/MacVST/TapeDelay/source/TapeDelayProc.cpp b/plugins/MacVST/TapeDelay/source/TapeDelayProc.cpp
index 43fa743..e2f1ade 100755
--- a/plugins/MacVST/TapeDelay/source/TapeDelayProc.cpp
+++ b/plugins/MacVST/TapeDelay/source/TapeDelayProc.cpp
@@ -156,18 +156,14 @@ void TapeDelay::processReplacing(float **inputs, float **outputs, VstInt32 sampl
 		inputSampleL = (inputSampleL * dry) + (dL[delay] * wet);		
 		inputSampleR = (inputSampleR * dry) + (dR[delay] * wet);				
 		
-		//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;
@@ -177,12 +173,6 @@ void TapeDelay::processReplacing(float **inputs, float **outputs, VstInt32 sampl
 		*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 TapeDelay::processDoubleReplacing(double **inputs, double **outputs, VstInt32 sampleFrames) 
@@ -333,18 +323,16 @@ void TapeDelay::processDoubleReplacing(double **inputs, double **outputs, VstInt
 		inputSampleL = (inputSampleL * dry) + (dL[delay] * wet);		
 		inputSampleR = (inputSampleR * dry) + (dR[delay] * wet);				
 		
-		//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;
@@ -354,10 +342,4 @@ void TapeDelay::processDoubleReplacing(double **inputs, double **outputs, VstInt
 		*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.	
 }