Floating Point Dither For All

5 files changed, 45 insertions, 78 deletions

diff --git a/plugins/MacVST/Capacitor/Capacitor.xcodeproj/christopherjohnson.pbxuser b/plugins/MacVST/Capacitor/Capacitor.xcodeproj/christopherjohnson.pbxuser
index a60059d..cb9af70 100755
--- a/plugins/MacVST/Capacitor/Capacitor.xcodeproj/christopherjohnson.pbxuser
+++ b/plugins/MacVST/Capacitor/Capacitor.xcodeproj/christopherjohnson.pbxuser
@@ -49,12 +49,12 @@
 					PBXFileDataSource_Warnings_ColumnID,
 				);
 			};
-			PBXPerProjectTemplateStateSaveDate = 528459434;
-			PBXWorkspaceStateSaveDate = 528459434;
+			PBXPerProjectTemplateStateSaveDate = 569733320;
+			PBXWorkspaceStateSaveDate = 569733320;
 		};
 		perUserProjectItems = {
 			8B4847521F6D432A007BD0D0 /* PBXTextBookmark */ = 8B4847521F6D432A007BD0D0 /* PBXTextBookmark */;
-			8B9D699F1F7EDD69007AB60F /* PBXTextBookmark */ = 8B9D699F1F7EDD69007AB60F /* PBXTextBookmark */;
+			8B79355E21F570E8006E9731 /* PBXTextBookmark */ = 8B79355E21F570E8006E9731 /* PBXTextBookmark */;
 			8B9D781B1F7FA737007AB60F /* PBXTextBookmark */ = 8B9D781B1F7FA737007AB60F /* PBXTextBookmark */;
 		};
 		sourceControlManager = 8B02375E1D42B1C400E1E8C8 /* Source Control */;
@@ -71,7 +71,7 @@
 	};
 	245463B80991757100464AD3 /* Capacitor.h */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {554, 1482}}";
+			sepNavIntBoundsRect = "{{0, 0}, {554, 1417}}";
 			sepNavSelRange = "{2958, 0}";
 			sepNavVisRange = "{0, 0}";
 			sepNavWindowFrame = "{{375, 39}, {895, 831}}";
@@ -87,9 +87,9 @@
 	};
 	24D8286F09A914000093AEF8 /* CapacitorProc.cpp */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {979, 5811}}";
+			sepNavIntBoundsRect = "{{0, 0}, {979, 5096}}";
 			sepNavSelRange = "{1264, 0}";
-			sepNavVisRange = "{970, 2251}";
+			sepNavVisRange = "{21333, 3687}";
 			sepNavWindowFrame = "{{368, 44}, {1026, 834}}";
 		};
 	};
@@ -117,15 +117,15 @@
 		vrLen = 166;
 		vrLoc = 20835;
 	};
-	8B9D699F1F7EDD69007AB60F /* PBXTextBookmark */ = {
+	8B79355E21F570E8006E9731 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 245463B80991757100464AD3 /* Capacitor.h */;
 		name = "Capacitor.h: 82";
 		rLen = 0;
 		rLoc = 2958;
 		rType = 0;
-		vrLen = 36;
-		vrLoc = 2376;
+		vrLen = 0;
+		vrLoc = 0;
 	};
 	8B9D781B1F7FA737007AB60F /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
diff --git a/plugins/MacVST/Capacitor/Capacitor.xcodeproj/christopherjohnson.perspectivev3 b/plugins/MacVST/Capacitor/Capacitor.xcodeproj/christopherjohnson.perspectivev3
index 486401d..3eed19a 100755
--- a/plugins/MacVST/Capacitor/Capacitor.xcodeproj/christopherjohnson.perspectivev3
+++ b/plugins/MacVST/Capacitor/Capacitor.xcodeproj/christopherjohnson.perspectivev3
@@ -323,7 +323,7 @@
 							<real>185</real>
 						</array>
 						<key>RubberWindowFrame</key>
-						<string>476 267 810 487 0 0 1440 878 </string>
+						<string>443 261 810 487 0 0 1440 878 </string>
 					</dict>
 					<key>Module</key>
 					<string>PBXSmartGroupTreeModule</string>
@@ -351,11 +351,11 @@
 										<key>_historyCapacity</key>
 										<integer>0</integer>
 										<key>bookmark</key>
-										<string>8B9D781B1F7FA737007AB60F</string>
+										<string>8B79355E21F570E8006E9731</string>
 										<key>history</key>
 										<array>
 											<string>8B4847521F6D432A007BD0D0</string>
-											<string>8B9D699F1F7EDD69007AB60F</string>
+											<string>8B9D781B1F7FA737007AB60F</string>
 										</array>
 									</dict>
 									<key>SplitCount</key>
@@ -369,18 +369,18 @@
 							<key>GeometryConfiguration</key>
 							<dict>
 								<key>Frame</key>
-								<string>{{0, 0}, {603, 20}}</string>
+								<string>{{0, 0}, {603, 0}}</string>
 								<key>RubberWindowFrame</key>
-								<string>476 267 810 487 0 0 1440 878 </string>
+								<string>443 261 810 487 0 0 1440 878 </string>
 							</dict>
 							<key>Module</key>
 							<string>PBXNavigatorGroup</string>
 							<key>Proportion</key>
-							<string>20pt</string>
+							<string>0pt</string>
 						</dict>
 						<dict>
 							<key>Proportion</key>
-							<string>421pt</string>
+							<string>441pt</string>
 							<key>Tabs</key>
 							<array>
 								<dict>
@@ -394,9 +394,9 @@
 									<key>GeometryConfiguration</key>
 									<dict>
 										<key>Frame</key>
-										<string>{{10, 27}, {603, 394}}</string>
+										<string>{{10, 27}, {603, 414}}</string>
 										<key>RubberWindowFrame</key>
-										<string>476 267 810 487 0 0 1440 878 </string>
+										<string>443 261 810 487 0 0 1440 878 </string>
 									</dict>
 									<key>Module</key>
 									<string>XCDetailModule</string>
@@ -478,11 +478,11 @@
 			</array>
 			<key>TableOfContents</key>
 			<array>
-				<string>8B9D781C1F7FA737007AB60F</string>
+				<string>8B79355F21F570E8006E9731</string>
 				<string>1CA23ED40692098700951B8B</string>
-				<string>8B9D781D1F7FA737007AB60F</string>
+				<string>8B79356021F570E8006E9731</string>
 				<string>8B0237581D42B1C400E1E8C8</string>
-				<string>8B9D781E1F7FA737007AB60F</string>
+				<string>8B79356121F570E8006E9731</string>
 				<string>1CA23EDF0692099D00951B8B</string>
 				<string>1CA23EE00692099D00951B8B</string>
 				<string>1CA23EE10692099D00951B8B</string>
@@ -635,7 +635,7 @@
 	<key>StatusbarIsVisible</key>
 	<true/>
 	<key>TimeStamp</key>
-	<real>528459575.56228501</real>
+	<real>569733352.25392997</real>
 	<key>ToolbarConfigUserDefaultsMinorVersion</key>
 	<string>2</string>
 	<key>ToolbarDisplayMode</key>
@@ -652,11 +652,10 @@
 	<integer>5</integer>
 	<key>WindowOrderList</key>
 	<array>
-		<string>8B9D781F1F7FA737007AB60F</string>
 		<string>/Users/christopherjohnson/Desktop/MacVST/Capacitor/Capacitor.xcodeproj</string>
 	</array>
 	<key>WindowString</key>
-	<string>476 267 810 487 0 0 1440 878 </string>
+	<string>443 261 810 487 0 0 1440 878 </string>
 	<key>WindowToolsV3</key>
 	<array>
 		<dict>
diff --git a/plugins/MacVST/Capacitor/source/Capacitor.cpp b/plugins/MacVST/Capacitor/source/Capacitor.cpp
index 2a62df6..0ade9c9 100755
--- a/plugins/MacVST/Capacitor/source/Capacitor.cpp
+++ b/plugins/MacVST/Capacitor/source/Capacitor.cpp
@@ -51,11 +51,8 @@ Capacitor::Capacitor(audioMasterCallback audioMaster) :
 	lastHighpass = 1000.0;
 	lastWet = 1000.0;
 	
-	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/Capacitor/source/Capacitor.h b/plugins/MacVST/Capacitor/source/Capacitor.h
index d80c676..0799d39 100755
--- a/plugins/MacVST/Capacitor/source/Capacitor.h
+++ b/plugins/MacVST/Capacitor/source/Capacitor.h
@@ -94,11 +94,8 @@ private:
 	double lastHighpass;
 	double lastWet;
 
-	long double fpNShapeLA;
-	long double fpNShapeLB;
-	long double fpNShapeRA;
-	long double fpNShapeRB;
-	bool fpFlip;
+	long double fpNShapeL;
+	long double fpNShapeR;
 	//default stuff
 
     float A;
diff --git a/plugins/MacVST/Capacitor/source/CapacitorProc.cpp b/plugins/MacVST/Capacitor/source/CapacitorProc.cpp
index 6accb0d..6b3582b 100755
--- a/plugins/MacVST/Capacitor/source/CapacitorProc.cpp
+++ b/plugins/MacVST/Capacitor/source/CapacitorProc.cpp
@@ -30,9 +30,6 @@ void Capacitor::processReplacing(float **inputs, float **outputs, VstInt32 sampl
 	double invHighpass;
 	double dry;
 	
-	float fpTemp;
-	long double fpOld = 0.618033988749894848204586; //golden ratio!
-	long double fpNew = 1.0 - fpOld;	
 
 	long double inputSampleL;
 	long double inputSampleR;
@@ -182,25 +179,14 @@ void Capacitor::processReplacing(float **inputs, float **outputs, VstInt32 sampl
 		inputSampleL = (drySampleL * dry) + (inputSampleL * wet);
 		inputSampleR = (drySampleR * dry) + (inputSampleR * wet);
 
-		//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;
@@ -235,9 +221,6 @@ void Capacitor::processDoubleReplacing(double **inputs, double **outputs, VstInt
 	double invHighpass;
 	double dry;
 	
-	double fpTemp;
-	long double fpOld = 0.618033988749894848204586; //golden ratio!
-	long double fpNew = 1.0 - fpOld;	
 	
 	long double inputSampleL;
 	long double inputSampleR;
@@ -387,25 +370,16 @@ void Capacitor::processDoubleReplacing(double **inputs, double **outputs, VstInt
 		inputSampleL = (drySampleL * dry) + (inputSampleL * wet);
 		inputSampleR = (drySampleR * dry) + (inputSampleR * wet);
 		
-		//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;