Floating Point Dither For All

3 files changed, 27 insertions, 105 deletions

diff --git a/plugins/MacVST/DubCenter/DubCenter.xcodeproj/christopherjohnson.pbxuser b/plugins/MacVST/DubCenter/DubCenter.xcodeproj/christopherjohnson.pbxuser
index 1ef293f..540fd54 100755
--- a/plugins/MacVST/DubCenter/DubCenter.xcodeproj/christopherjohnson.pbxuser
+++ b/plugins/MacVST/DubCenter/DubCenter.xcodeproj/christopherjohnson.pbxuser
@@ -49,12 +49,8 @@
 					PBXFileDataSource_Warnings_ColumnID,
 				);
 			};
-			PBXPerProjectTemplateStateSaveDate = 561848737;
-			PBXWorkspaceStateSaveDate = 561848737;
-		};
-		perUserProjectItems = {
-			8B560C61217D21A400D3BC37 /* PBXBookmark */ = 8B560C61217D21A400D3BC37 /* PBXBookmark */;
-			8B560C71217D21F300D3BC37 /* PBXTextBookmark */ = 8B560C71217D21F300D3BC37 /* PBXTextBookmark */;
+			PBXPerProjectTemplateStateSaveDate = 569734854;
+			PBXWorkspaceStateSaveDate = 569734854;
 		};
 		sourceControlManager = 8B02375E1D42B1C400E1E8C8 /* Source Control */;
 		userBuildSettings = {
@@ -86,9 +82,9 @@
 	};
 	24D8286F09A914000093AEF8 /* DubCenterProc.cpp */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {848, 8359}}";
+			sepNavIntBoundsRect = "{{0, 0}, {848, 8086}}";
 			sepNavSelRange = "{6339, 0}";
-			sepNavVisRange = "{5917, 3197}";
+			sepNavVisRange = "{5899, 3296}";
 			sepNavWindowFrame = "{{45, 47}, {895, 831}}";
 		};
 	};
@@ -106,20 +102,6 @@
 		isa = PBXCodeSenseManager;
 		indexTemplatePath = "";
 	};
-	8B560C61217D21A400D3BC37 /* PBXBookmark */ = {
-		isa = PBXBookmark;
-		fRef = 24D8286F09A914000093AEF8 /* DubCenterProc.cpp */;
-	};
-	8B560C71217D21F300D3BC37 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 24D8286F09A914000093AEF8 /* DubCenterProc.cpp */;
-		name = "DubCenterProc.cpp: 189";
-		rLen = 0;
-		rLoc = 6339;
-		rType = 0;
-		vrLen = 3197;
-		vrLoc = 5917;
-	};
 	8D01CCC60486CAD60068D4B7 /* DubCenter */ = {
 		activeExec = 0;
 	};
diff --git a/plugins/MacVST/DubCenter/DubCenter.xcodeproj/christopherjohnson.perspectivev3 b/plugins/MacVST/DubCenter/DubCenter.xcodeproj/christopherjohnson.perspectivev3
index 7593523..1b66276 100755
--- a/plugins/MacVST/DubCenter/DubCenter.xcodeproj/christopherjohnson.perspectivev3
+++ b/plugins/MacVST/DubCenter/DubCenter.xcodeproj/christopherjohnson.perspectivev3
@@ -222,48 +222,7 @@
 		</dict>
 	</array>
 	<key>OpenEditors</key>
-	<array>
-		<dict>
-			<key>Content</key>
-			<dict>
-				<key>PBXProjectModuleGUID</key>
-				<string>8B560C6F217D21F300D3BC37</string>
-				<key>PBXProjectModuleLabel</key>
-				<string>DubCenterProc.cpp</string>
-				<key>PBXSplitModuleInNavigatorKey</key>
-				<dict>
-					<key>Split0</key>
-					<dict>
-						<key>PBXProjectModuleGUID</key>
-						<string>8B560C70217D21F300D3BC37</string>
-						<key>PBXProjectModuleLabel</key>
-						<string>DubCenterProc.cpp</string>
-						<key>_historyCapacity</key>
-						<integer>0</integer>
-						<key>bookmark</key>
-						<string>8B560C71217D21F300D3BC37</string>
-						<key>history</key>
-						<array>
-							<string>8B560C61217D21A400D3BC37</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}, {895, 734}}</string>
-				<key>PBXModuleWindowStatusBarHidden2</key>
-				<false/>
-				<key>RubberWindowFrame</key>
-				<string>45 103 895 775 0 0 1440 878 </string>
-			</dict>
-		</dict>
-	</array>
+	<array/>
 	<key>PerspectiveWidths</key>
 	<array>
 		<integer>810</integer>
@@ -510,11 +469,11 @@
 			</array>
 			<key>TableOfContents</key>
 			<array>
-				<string>8B560C6C217D21F300D3BC37</string>
+				<string>8B79392221F576D2006E9731</string>
 				<string>1CA23ED40692098700951B8B</string>
-				<string>8B560C6D217D21F300D3BC37</string>
+				<string>8B79392321F576D2006E9731</string>
 				<string>8B0237581D42B1C400E1E8C8</string>
-				<string>8B560C6E217D21F300D3BC37</string>
+				<string>8B79392421F576D2006E9731</string>
 				<string>1CA23EDF0692099D00951B8B</string>
 				<string>1CA23EE00692099D00951B8B</string>
 				<string>1CA23EE10692099D00951B8B</string>
@@ -667,7 +626,7 @@
 	<key>StatusbarIsVisible</key>
 	<true/>
 	<key>TimeStamp</key>
-	<real>561848819.78781903</real>
+	<real>569734870.07559299</real>
 	<key>ToolbarConfigUserDefaultsMinorVersion</key>
 	<string>2</string>
 	<key>ToolbarDisplayMode</key>
@@ -685,7 +644,6 @@
 	<key>WindowOrderList</key>
 	<array>
 		<string>/Users/christopherjohnson/Desktop/MacVST/DubCenter/DubCenter.xcodeproj</string>
-		<string>8B560C6F217D21F300D3BC37</string>
 	</array>
 	<key>WindowString</key>
 	<string>28 291 810 487 0 0 1440 878 </string>
diff --git a/plugins/MacVST/DubCenter/source/DubCenterProc.cpp b/plugins/MacVST/DubCenter/source/DubCenterProc.cpp
index 75c162b..b0c49a3 100755
--- a/plugins/MacVST/DubCenter/source/DubCenterProc.cpp
+++ b/plugins/MacVST/DubCenter/source/DubCenterProc.cpp
@@ -306,18 +306,14 @@ void DubCenter::processReplacing(float **inputs, float **outputs, VstInt32 sampl
 		bflip++;
 		if (bflip < 1 || bflip > 3) bflip = 1;
 		
-		//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;
@@ -327,12 +323,6 @@ void DubCenter::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 DubCenter::processDoubleReplacing(double **inputs, double **outputs, VstInt32 sampleFrames) 
@@ -633,18 +623,16 @@ void DubCenter::processDoubleReplacing(double **inputs, double **outputs, VstInt
 		bflip++;
 		if (bflip < 1 || bflip > 3) bflip = 1;
 		
-		//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;
@@ -654,10 +642,4 @@ void DubCenter::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.	
 }