Floating Point Dither For All

5 files changed, 33 insertions, 66 deletions

diff --git a/plugins/MacVST/PhaseNudge/PhaseNudge.xcodeproj/christopherjohnson.pbxuser b/plugins/MacVST/PhaseNudge/PhaseNudge.xcodeproj/christopherjohnson.pbxuser
index 912d676..5bc2f16 100755
--- a/plugins/MacVST/PhaseNudge/PhaseNudge.xcodeproj/christopherjohnson.pbxuser
+++ b/plugins/MacVST/PhaseNudge/PhaseNudge.xcodeproj/christopherjohnson.pbxuser
@@ -49,11 +49,11 @@
 					PBXFileDataSource_Warnings_ColumnID,
 				);
 			};
-			PBXPerProjectTemplateStateSaveDate = 528461482;
-			PBXWorkspaceStateSaveDate = 528461482;
+			PBXPerProjectTemplateStateSaveDate = 569770816;
+			PBXWorkspaceStateSaveDate = 569770816;
 		};
 		perUserProjectItems = {
-			8B9D6EC41F7EF3B7007AB60F /* PBXTextBookmark */ = 8B9D6EC41F7EF3B7007AB60F /* PBXTextBookmark */;
+			8B793DB821F60356006E9731 /* PBXTextBookmark */ = 8B793DB821F60356006E9731 /* PBXTextBookmark */;
 			8B9D7CAA1F7FAEC4007AB60F /* PBXTextBookmark */ = 8B9D7CAA1F7FAEC4007AB60F /* PBXTextBookmark */;
 		};
 		sourceControlManager = 8B02375E1D42B1C400E1E8C8 /* Source Control */;
@@ -62,7 +62,7 @@
 	};
 	2407DEB6089929BA00EB68BF /* PhaseNudge.cpp */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {554, 1768}}";
+			sepNavIntBoundsRect = "{{0, 0}, {554, 1703}}";
 			sepNavSelRange = "{565, 0}";
 			sepNavVisRange = "{0, 0}";
 			sepNavWindowFrame = "{{12, 47}, {895, 831}}";
@@ -106,7 +106,7 @@
 		isa = PBXCodeSenseManager;
 		indexTemplatePath = "";
 	};
-	8B9D6EC41F7EF3B7007AB60F /* PBXTextBookmark */ = {
+	8B793DB821F60356006E9731 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 2407DEB6089929BA00EB68BF /* PhaseNudge.cpp */;
 		name = "PhaseNudge.cpp: 18";
diff --git a/plugins/MacVST/PhaseNudge/PhaseNudge.xcodeproj/christopherjohnson.perspectivev3 b/plugins/MacVST/PhaseNudge/PhaseNudge.xcodeproj/christopherjohnson.perspectivev3
index 987bfeb..0540e81 100755
--- a/plugins/MacVST/PhaseNudge/PhaseNudge.xcodeproj/christopherjohnson.perspectivev3
+++ b/plugins/MacVST/PhaseNudge/PhaseNudge.xcodeproj/christopherjohnson.perspectivev3
@@ -351,10 +351,10 @@
 										<key>_historyCapacity</key>
 										<integer>0</integer>
 										<key>bookmark</key>
-										<string>8B9D7CAA1F7FAEC4007AB60F</string>
+										<string>8B793DB821F60356006E9731</string>
 										<key>history</key>
 										<array>
-											<string>8B9D6EC41F7EF3B7007AB60F</string>
+											<string>8B9D7CAA1F7FAEC4007AB60F</string>
 										</array>
 									</dict>
 									<key>SplitCount</key>
@@ -477,11 +477,11 @@
 			</array>
 			<key>TableOfContents</key>
 			<array>
-				<string>8B9D7CAB1F7FAEC4007AB60F</string>
+				<string>8B793DB921F60356006E9731</string>
 				<string>1CA23ED40692098700951B8B</string>
-				<string>8B9D7CAC1F7FAEC4007AB60F</string>
+				<string>8B793DBA21F60356006E9731</string>
 				<string>8B0237581D42B1C400E1E8C8</string>
-				<string>8B9D7CAD1F7FAEC4007AB60F</string>
+				<string>8B793DBB21F60356006E9731</string>
 				<string>1CA23EDF0692099D00951B8B</string>
 				<string>1CA23EE00692099D00951B8B</string>
 				<string>1CA23EE10692099D00951B8B</string>
@@ -634,7 +634,7 @@
 	<key>StatusbarIsVisible</key>
 	<true/>
 	<key>TimeStamp</key>
-	<real>528461508.86837101</real>
+	<real>569770838.654899</real>
 	<key>ToolbarConfigUserDefaultsMinorVersion</key>
 	<string>2</string>
 	<key>ToolbarDisplayMode</key>
@@ -651,7 +651,6 @@
 	<integer>5</integer>
 	<key>WindowOrderList</key>
 	<array>
-		<string>8B9D7CAE1F7FAEC4007AB60F</string>
 		<string>/Users/christopherjohnson/Desktop/MacVST/PhaseNudge/PhaseNudge.xcodeproj</string>
 	</array>
 	<key>WindowString</key>
diff --git a/plugins/MacVST/PhaseNudge/source/PhaseNudge.cpp b/plugins/MacVST/PhaseNudge/source/PhaseNudge.cpp
index 8a77175..e9e5c8d 100755
--- a/plugins/MacVST/PhaseNudge/source/PhaseNudge.cpp
+++ b/plugins/MacVST/PhaseNudge/source/PhaseNudge.cpp
@@ -16,11 +16,8 @@ PhaseNudge::PhaseNudge(audioMasterCallback audioMaster) :
 	B = 1.0;
 	for(int count = 0; count < 1502; count++) {dL[count] = 0.0; dR[count] = 0.0;}
 	one = 1; maxdelay = 9001;
-	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/PhaseNudge/source/PhaseNudge.h b/plugins/MacVST/PhaseNudge/source/PhaseNudge.h
index cba0ac8..2926ccb 100755
--- a/plugins/MacVST/PhaseNudge/source/PhaseNudge.h
+++ b/plugins/MacVST/PhaseNudge/source/PhaseNudge.h
@@ -57,11 +57,8 @@ private:
 	double dR[1503];
 	int one, maxdelay;
 
-	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/PhaseNudge/source/PhaseNudgeProc.cpp b/plugins/MacVST/PhaseNudge/source/PhaseNudgeProc.cpp
index 494c841..150ecd5 100755
--- a/plugins/MacVST/PhaseNudge/source/PhaseNudgeProc.cpp
+++ b/plugins/MacVST/PhaseNudge/source/PhaseNudgeProc.cpp
@@ -14,9 +14,6 @@ void PhaseNudge::processReplacing(float **inputs, float **outputs, VstInt32 samp
     float* out1 = outputs[0];
     float* out2 = outputs[1];
 
-	float fpTemp;
-	long double fpOld = 0.618033988749894848204586; //golden ratio!
-	long double fpNew = 1.0 - fpOld;	
 	
 	int allpasstemp;
 	double outallpass = 0.618033988749894848204586; //golden ratio!
@@ -136,25 +133,14 @@ void PhaseNudge::processReplacing(float **inputs, float **outputs, VstInt32 samp
 			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;
@@ -173,9 +159,6 @@ void PhaseNudge::processDoubleReplacing(double **inputs, double **outputs, VstIn
     double* out1 = outputs[0];
     double* out2 = outputs[1];
 
-	double fpTemp;
-	long double fpOld = 0.618033988749894848204586; //golden ratio!
-	long double fpNew = 1.0 - fpOld;	
 	
 	int allpasstemp;
 	double outallpass = 0.618033988749894848204586; //golden ratio!
@@ -294,25 +277,16 @@ void PhaseNudge::processDoubleReplacing(double **inputs, double **outputs, VstIn
 			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;