Floating Point Dither For All

5 files changed, 48 insertions, 138 deletions

diff --git a/plugins/MacVST/ElectroHat/ElectroHat.xcodeproj/christopherjohnson.pbxuser b/plugins/MacVST/ElectroHat/ElectroHat.xcodeproj/christopherjohnson.pbxuser
index 002e6ef..bf3d2b1 100755
--- a/plugins/MacVST/ElectroHat/ElectroHat.xcodeproj/christopherjohnson.pbxuser
+++ b/plugins/MacVST/ElectroHat/ElectroHat.xcodeproj/christopherjohnson.pbxuser
@@ -49,15 +49,13 @@
 					PBXFileDataSource_Warnings_ColumnID,
 				);
 			};
-			PBXPerProjectTemplateStateSaveDate = 541289959;
-			PBXWorkspaceStateSaveDate = 541289959;
+			PBXPerProjectTemplateStateSaveDate = 569735050;
+			PBXWorkspaceStateSaveDate = 569735050;
 		};
 		perUserProjectItems = {
+			8B7939A121F57797006E9731 /* PBXTextBookmark */ = 8B7939A121F57797006E9731 /* PBXTextBookmark */;
 			8BC009F720436BB500304BC7 /* PBXTextBookmark */ = 8BC009F720436BB500304BC7 /* PBXTextBookmark */;
-			8BC009F920436BB500304BC7 /* PBXTextBookmark */ = 8BC009F920436BB500304BC7 /* PBXTextBookmark */;
-			8BC00A0C20436DEA00304BC7 /* PBXBookmark */ = 8BC00A0C20436DEA00304BC7 /* PBXBookmark */;
 			8BC00A1E20436E0500304BC7 /* PBXTextBookmark */ = 8BC00A1E20436E0500304BC7 /* PBXTextBookmark */;
-			8BC00A1F20436E0500304BC7 /* PBXTextBookmark */ = 8BC00A1F20436E0500304BC7 /* PBXTextBookmark */;
 		};
 		sourceControlManager = 8B02375E1D42B1C400E1E8C8 /* Source Control */;
 		userBuildSettings = {
@@ -89,9 +87,9 @@
 	};
 	24D8286F09A914000093AEF8 /* ElectroHatProc.cpp */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {554, 3952}}";
+			sepNavIntBoundsRect = "{{0, 0}, {554, 3705}}";
 			sepNavSelRange = "{5210, 0}";
-			sepNavVisRange = "{5074, 138}";
+			sepNavVisRange = "{5118, 103}";
 			sepNavWindowFrame = "{{57, 47}, {895, 831}}";
 		};
 	};
@@ -109,6 +107,16 @@
 		isa = PBXCodeSenseManager;
 		indexTemplatePath = "";
 	};
+	8B7939A121F57797006E9731 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 24D8286F09A914000093AEF8 /* ElectroHatProc.cpp */;
+		name = "ElectroHatProc.cpp: 182";
+		rLen = 0;
+		rLoc = 5210;
+		rType = 0;
+		vrLen = 103;
+		vrLoc = 5118;
+	};
 	8BC009F720436BB500304BC7 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 2407DEB6089929BA00EB68BF /* ElectroHat.cpp */;
@@ -119,20 +127,6 @@
 		vrLen = 124;
 		vrLoc = 508;
 	};
-	8BC009F920436BB500304BC7 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 24D8286F09A914000093AEF8 /* ElectroHatProc.cpp */;
-		name = "ElectroHatProc.cpp: 183";
-		rLen = 0;
-		rLoc = 5210;
-		rType = 0;
-		vrLen = 158;
-		vrLoc = 5057;
-	};
-	8BC00A0C20436DEA00304BC7 /* PBXBookmark */ = {
-		isa = PBXBookmark;
-		fRef = 24D8286F09A914000093AEF8 /* ElectroHatProc.cpp */;
-	};
 	8BC00A1E20436E0500304BC7 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 24D8286F09A914000093AEF8 /* ElectroHatProc.cpp */;
@@ -143,16 +137,6 @@
 		vrLen = 138;
 		vrLoc = 5074;
 	};
-	8BC00A1F20436E0500304BC7 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 24D8286F09A914000093AEF8 /* ElectroHatProc.cpp */;
-		name = "ElectroHatProc.cpp: 111";
-		rLen = 0;
-		rLoc = 3370;
-		rType = 0;
-		vrLen = 1769;
-		vrLoc = 2424;
-	};
 	8D01CCC60486CAD60068D4B7 /* ElectroHat */ = {
 		activeExec = 0;
 	};
diff --git a/plugins/MacVST/ElectroHat/ElectroHat.xcodeproj/christopherjohnson.perspectivev3 b/plugins/MacVST/ElectroHat/ElectroHat.xcodeproj/christopherjohnson.perspectivev3
index fa3c51a..c845be7 100755
--- a/plugins/MacVST/ElectroHat/ElectroHat.xcodeproj/christopherjohnson.perspectivev3
+++ b/plugins/MacVST/ElectroHat/ElectroHat.xcodeproj/christopherjohnson.perspectivev3
@@ -222,48 +222,7 @@
 		</dict>
 	</array>
 	<key>OpenEditors</key>
-	<array>
-		<dict>
-			<key>Content</key>
-			<dict>
-				<key>PBXProjectModuleGUID</key>
-				<string>8BC00A1120436E0500304BC7</string>
-				<key>PBXProjectModuleLabel</key>
-				<string>ElectroHatProc.cpp</string>
-				<key>PBXSplitModuleInNavigatorKey</key>
-				<dict>
-					<key>Split0</key>
-					<dict>
-						<key>PBXProjectModuleGUID</key>
-						<string>8BC00A1220436E0500304BC7</string>
-						<key>PBXProjectModuleLabel</key>
-						<string>ElectroHatProc.cpp</string>
-						<key>_historyCapacity</key>
-						<integer>0</integer>
-						<key>bookmark</key>
-						<string>8BC00A1F20436E0500304BC7</string>
-						<key>history</key>
-						<array>
-							<string>8BC00A0C20436DEA00304BC7</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>57 103 895 775 0 0 1440 878 </string>
-			</dict>
-		</dict>
-	</array>
+	<array/>
 	<key>PerspectiveWidths</key>
 	<array>
 		<integer>810</integer>
@@ -392,11 +351,11 @@
 										<key>_historyCapacity</key>
 										<integer>0</integer>
 										<key>bookmark</key>
-										<string>8BC00A1E20436E0500304BC7</string>
+										<string>8B7939A121F57797006E9731</string>
 										<key>history</key>
 										<array>
 											<string>8BC009F720436BB500304BC7</string>
-											<string>8BC009F920436BB500304BC7</string>
+											<string>8BC00A1E20436E0500304BC7</string>
 										</array>
 									</dict>
 									<key>SplitCount</key>
@@ -410,18 +369,18 @@
 							<key>GeometryConfiguration</key>
 							<dict>
 								<key>Frame</key>
-								<string>{{0, 0}, {603, 102}}</string>
+								<string>{{0, 0}, {603, 86}}</string>
 								<key>RubberWindowFrame</key>
 								<string>35 342 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>
@@ -435,7 +394,7 @@
 									<key>GeometryConfiguration</key>
 									<dict>
 										<key>Frame</key>
-										<string>{{10, 27}, {603, 312}}</string>
+										<string>{{10, 27}, {603, 328}}</string>
 										<key>RubberWindowFrame</key>
 										<string>35 342 810 487 0 0 1440 878 </string>
 									</dict>
@@ -519,11 +478,11 @@
 			</array>
 			<key>TableOfContents</key>
 			<array>
-				<string>8BC00A0E20436E0500304BC7</string>
+				<string>8B7939A221F57797006E9731</string>
 				<string>1CA23ED40692098700951B8B</string>
-				<string>8BC00A0F20436E0500304BC7</string>
+				<string>8B7939A321F57797006E9731</string>
 				<string>8B0237581D42B1C400E1E8C8</string>
-				<string>8BC00A1020436E0500304BC7</string>
+				<string>8B7939A421F57797006E9731</string>
 				<string>1CA23EDF0692099D00951B8B</string>
 				<string>1CA23EE00692099D00951B8B</string>
 				<string>1CA23EE10692099D00951B8B</string>
@@ -676,7 +635,7 @@
 	<key>StatusbarIsVisible</key>
 	<true/>
 	<key>TimeStamp</key>
-	<real>541289989.72780704</real>
+	<real>569735063.85601294</real>
 	<key>ToolbarConfigUserDefaultsMinorVersion</key>
 	<string>2</string>
 	<key>ToolbarDisplayMode</key>
@@ -694,7 +653,6 @@
 	<key>WindowOrderList</key>
 	<array>
 		<string>/Users/christopherjohnson/Desktop/MacVST/ElectroHat/ElectroHat.xcodeproj</string>
-		<string>8BC00A1120436E0500304BC7</string>
 	</array>
 	<key>WindowString</key>
 	<string>35 342 810 487 0 0 1440 878 </string>
diff --git a/plugins/MacVST/ElectroHat/source/ElectroHat.cpp b/plugins/MacVST/ElectroHat/source/ElectroHat.cpp
index 33d1058..6be41e4 100755
--- a/plugins/MacVST/ElectroHat/source/ElectroHat.cpp
+++ b/plugins/MacVST/ElectroHat/source/ElectroHat.cpp
@@ -25,11 +25,8 @@ ElectroHat::ElectroHat(audioMasterCallback audioMaster) :
 	lok = 0;
 	flip = true;
 	
-	fpNShapeLA = 0.0;
-	fpNShapeLB = 0.0;
-	fpNShapeRA = 0.0;
-	fpNShapeRB = 0.0;
-	fpFlip = true;
+	fpNShapeL = 0.0;
+	fpNShapeR = 0.0;
 	//this is reset: values being initialized only once. Startup values, whatever they are.
 	
     _canDo.insert("plugAsChannelInsert"); // plug-in can be used as a channel insert effect.
diff --git a/plugins/MacVST/ElectroHat/source/ElectroHat.h b/plugins/MacVST/ElectroHat/source/ElectroHat.h
index e8aa325..85315cd 100755
--- a/plugins/MacVST/ElectroHat/source/ElectroHat.h
+++ b/plugins/MacVST/ElectroHat/source/ElectroHat.h
@@ -56,11 +56,8 @@ private:
     char _programName[kVstMaxProgNameLen + 1];
     std::set< std::string > _canDo;
     
-	long double fpNShapeLA;
-	long double fpNShapeLB;
-	long double fpNShapeRA;
-	long double fpNShapeRB;
-	bool fpFlip;
+	long double fpNShapeL;
+	long double fpNShapeR;
 	//default stuff
 	
 	double storedSampleL;
diff --git a/plugins/MacVST/ElectroHat/source/ElectroHatProc.cpp b/plugins/MacVST/ElectroHat/source/ElectroHatProc.cpp
index 69b1a00..ee5a307 100755
--- a/plugins/MacVST/ElectroHat/source/ElectroHatProc.cpp
+++ b/plugins/MacVST/ElectroHat/source/ElectroHatProc.cpp
@@ -20,9 +20,6 @@ void ElectroHat::processReplacing(float **inputs, float **outputs, VstInt32 samp
 	bool highSample = false;
 	if (getSampleRate() > 64000) highSample = true;
 	//we will go to another dither for 88 and 96K
-	float fpTemp;
-	long double fpOld = 0.618033988749894848204586; //golden ratio!
-	long double fpNew = 1.0 - fpOld;	
 
 	double drySampleL;
 	double drySampleR;
@@ -126,25 +123,14 @@ void ElectroHat::processReplacing(float **inputs, float **outputs, VstInt32 samp
 			inputSampleR = (inputSampleR * wet) + (drySampleR * dry);
 		}		
 		
-		//noise shaping to 32-bit floating point
-		if (fpFlip) {
-			fpTemp = inputSampleL;
-			fpNShapeLA = (fpNShapeLA*fpOld)+((inputSampleL-fpTemp)*fpNew);
-			inputSampleL += fpNShapeLA;
-			fpTemp = inputSampleR;
-			fpNShapeRA = (fpNShapeRA*fpOld)+((inputSampleR-fpTemp)*fpNew);
-			inputSampleR += fpNShapeRA;
-		}
-		else {
-			fpTemp = inputSampleL;
-			fpNShapeLB = (fpNShapeLB*fpOld)+((inputSampleL-fpTemp)*fpNew);
-			inputSampleL += fpNShapeLB;
-			fpTemp = inputSampleR;
-			fpNShapeRB = (fpNShapeRB*fpOld)+((inputSampleR-fpTemp)*fpNew);
-			inputSampleR += fpNShapeRB;
-		}
-		fpFlip = !fpFlip;
-		//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;
@@ -169,9 +155,6 @@ void ElectroHat::processDoubleReplacing(double **inputs, double **outputs, VstIn
 	bool highSample = false;
 	if (getSampleRate() > 64000) highSample = true;
 	//we will go to another dither for 88 and 96K
-	double fpTemp;
-	long double fpOld = 0.618033988749894848204586; //golden ratio!
-	long double fpNew = 1.0 - fpOld;	
 	
 	double drySampleL;
 	double drySampleR;
@@ -275,25 +258,16 @@ void ElectroHat::processDoubleReplacing(double **inputs, double **outputs, VstIn
 			inputSampleR = (inputSampleR * wet) + (drySampleR * dry);
 		}		
 				
-		//noise shaping to 64-bit floating point
-		if (fpFlip) {
-			fpTemp = inputSampleL;
-			fpNShapeLA = (fpNShapeLA*fpOld)+((inputSampleL-fpTemp)*fpNew);
-			inputSampleL += fpNShapeLA;
-			fpTemp = inputSampleR;
-			fpNShapeRA = (fpNShapeRA*fpOld)+((inputSampleR-fpTemp)*fpNew);
-			inputSampleR += fpNShapeRA;
-		}
-		else {
-			fpTemp = inputSampleL;
-			fpNShapeLB = (fpNShapeLB*fpOld)+((inputSampleL-fpTemp)*fpNew);
-			inputSampleL += fpNShapeLB;
-			fpTemp = inputSampleR;
-			fpNShapeRB = (fpNShapeRB*fpOld)+((inputSampleR-fpTemp)*fpNew);
-			inputSampleR += fpNShapeRB;
-		}
-		fpFlip = !fpFlip;
-		//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;