Floating Point Dither For All

4 files changed, 25 insertions, 58 deletions

diff --git a/plugins/WinVST/Lowpass/.vs/VSTProject/v14/.suo b/plugins/WinVST/Lowpass/.vs/VSTProject/v14/.suo
index f5cbb3f..cf0ac15 100755
--- a/plugins/WinVST/Lowpass/.vs/VSTProject/v14/.suo
+++ b/plugins/WinVST/Lowpass/.vs/VSTProject/v14/.suo
diff --git a/plugins/WinVST/Lowpass/Lowpass.cpp b/plugins/WinVST/Lowpass/Lowpass.cpp
index 8178799..18064fc 100755
--- a/plugins/WinVST/Lowpass/Lowpass.cpp
+++ b/plugins/WinVST/Lowpass/Lowpass.cpp
@@ -19,10 +19,8 @@ Lowpass::Lowpass(audioMasterCallback audioMaster) :
 	iirSampleBL = 0.0;
 	iirSampleAR = 0.0;
 	iirSampleBR = 0.0;
-	fpNShapeLA = 0.0;
-	fpNShapeLB = 0.0;
-	fpNShapeRA = 0.0;
-	fpNShapeRB = 0.0;
+	fpNShapeL = 0.0;
+	fpNShapeR = 0.0;
 	fpFlip = true;
 	//this is reset: values being initialized only once. Startup values, whatever they are.
 	
diff --git a/plugins/WinVST/Lowpass/Lowpass.h b/plugins/WinVST/Lowpass/Lowpass.h
index 1b99c55..40ac456 100755
--- a/plugins/WinVST/Lowpass/Lowpass.h
+++ b/plugins/WinVST/Lowpass/Lowpass.h
@@ -54,11 +54,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
 
     float A;
@@ -68,7 +65,7 @@ private:
 	double iirSampleBL;
 	double iirSampleAR;
 	double iirSampleBR;
-
+	bool fpFlip;
 };
 
 #endif
diff --git a/plugins/WinVST/Lowpass/LowpassProc.cpp b/plugins/WinVST/Lowpass/LowpassProc.cpp
index bcce714..bcc3690 100755
--- a/plugins/WinVST/Lowpass/LowpassProc.cpp
+++ b/plugins/WinVST/Lowpass/LowpassProc.cpp
@@ -27,9 +27,6 @@ void Lowpass::processReplacing(float **inputs, float **outputs, VstInt32 sampleF
 	double inputSampleR;
 	double outputSampleL;
 	double outputSampleR;
-	float fpTemp;
-	long double fpOld = 0.618033988749894848204586; //golden ratio!
-	long double fpNew = 1.0 - fpOld;
 	
 	iirAmount += (iirAmount * tight * tight);
 	if (tight > 0) tight /= 1.5;
@@ -116,33 +113,21 @@ void Lowpass::processReplacing(float **inputs, float **outputs, VstInt32 sampleF
 			iirSampleBR = (iirSampleBR * (1 - (offset * iirAmount))) + (inputSampleR * (offset * iirAmount));
 			outputSampleR = iirSampleBR;
 		}
+		fpFlip = !fpFlip;
 
 		
 		
 		if (wet < 1.0) outputSampleL = (outputSampleL * wet) + (inputSampleL * dry);
 		if (wet < 1.0) outputSampleR = (outputSampleR * wet) + (inputSampleR * dry);
 
-		//noise shaping to 32-bit floating point
-		if (fpFlip) {
-			fpTemp = outputSampleL;
-			fpNShapeLA = (fpNShapeLA*fpOld)+((outputSampleL-fpTemp)*fpNew);
-			outputSampleL += fpNShapeLA;
-			
-			fpTemp = outputSampleR;
-			fpNShapeRA = (fpNShapeRA*fpOld)+((outputSampleR-fpTemp)*fpNew);
-			outputSampleR += fpNShapeRA;
-		}
-		else {
-			fpTemp = outputSampleL;
-			fpNShapeLB = (fpNShapeLB*fpOld)+((outputSampleL-fpTemp)*fpNew);
-			outputSampleL += fpNShapeLB;
-			
-			fpTemp = outputSampleR;
-			fpNShapeRB = (fpNShapeRB*fpOld)+((outputSampleR-fpTemp)*fpNew);
-			outputSampleR += 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 = outputSampleL;
 		*out2 = outputSampleR;
@@ -174,9 +159,6 @@ void Lowpass::processDoubleReplacing(double **inputs, double **outputs, VstInt32
 	double inputSampleR;
 	double outputSampleL;
 	double outputSampleR;
-	double fpTemp;
-	double fpOld = 0.618033988749894848204586; //golden ratio!
-	double fpNew = 1.0 - fpOld;
 	
 	iirAmount += (iirAmount * tight * tight);
 	if (tight > 0) tight /= 1.5;
@@ -263,33 +245,23 @@ void Lowpass::processDoubleReplacing(double **inputs, double **outputs, VstInt32
 			iirSampleBR = (iirSampleBR * (1 - (offset * iirAmount))) + (inputSampleR * (offset * iirAmount));
 			outputSampleR = iirSampleBR;
 		}
+		fpFlip = !fpFlip;
 		
 		
 		
 		if (wet < 1.0) outputSampleL = (outputSampleL * wet) + (inputSampleL * dry);
 		if (wet < 1.0) outputSampleR = (outputSampleR * wet) + (inputSampleR * dry);
 		
-		//noise shaping to 64-bit floating point
-		if (fpFlip) {
-			fpTemp = outputSampleL;
-			fpNShapeLA = (fpNShapeLA*fpOld)+((outputSampleL-fpTemp)*fpNew);
-			outputSampleL += fpNShapeLA;
-			
-			fpTemp = outputSampleR;
-			fpNShapeRA = (fpNShapeRA*fpOld)+((outputSampleR-fpTemp)*fpNew);
-			outputSampleR += fpNShapeRA;
-		}
-		else {
-			fpTemp = outputSampleL;
-			fpNShapeLB = (fpNShapeLB*fpOld)+((outputSampleL-fpTemp)*fpNew);
-			outputSampleL += fpNShapeLB;
-			
-			fpTemp = outputSampleR;
-			fpNShapeRB = (fpNShapeRB*fpOld)+((outputSampleR-fpTemp)*fpNew);
-			outputSampleR += fpNShapeRB;
-		}
-		fpFlip = !fpFlip;
-		//end noise shaping on 32 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 = outputSampleL;
 		*out2 = outputSampleR;