From 966f2d253cd2ee6ce140ad68095a20a9d2b63052 Mon Sep 17 00:00:00 2001
From: Chris Johnson <jinx6568@sover.net>
Date: Sun, 27 Jan 2019 21:13:54 -0500
Subject: Floating Point Dither For All

---
 plugins/WinVST/StereoFX/.vs/VSTProject/v14/.suo | Bin 23040 -> 23040 bytes
 plugins/WinVST/StereoFX/StereoFX.cpp            |   6 +--
 plugins/WinVST/StereoFX/StereoFX.h              |   6 +--
 plugins/WinVST/StereoFX/StereoFXProc.cpp        |  62 +++++++-----------------
 4 files changed, 22 insertions(+), 52 deletions(-)

(limited to 'plugins/WinVST/StereoFX')

diff --git a/plugins/WinVST/StereoFX/.vs/VSTProject/v14/.suo b/plugins/WinVST/StereoFX/.vs/VSTProject/v14/.suo
index 61fb690..3d0e385 100755
Binary files a/plugins/WinVST/StereoFX/.vs/VSTProject/v14/.suo and b/plugins/WinVST/StereoFX/.vs/VSTProject/v14/.suo differ
diff --git a/plugins/WinVST/StereoFX/StereoFX.cpp b/plugins/WinVST/StereoFX/StereoFX.cpp
index 63c23db..704cbf3 100755
--- a/plugins/WinVST/StereoFX/StereoFX.cpp
+++ b/plugins/WinVST/StereoFX/StereoFX.cpp
@@ -17,10 +17,8 @@ StereoFX::StereoFX(audioMasterCallback audioMaster) :
 	C = 0.0;
 	iirSampleA = 0.0;
 	iirSampleB = 0.0;
-	fpNShapeLA = 0.0;
-	fpNShapeLB = 0.0;
-	fpNShapeRA = 0.0;
-	fpNShapeRB = 0.0;
+	fpNShapeL = 0.0;
+	fpNShapeR = 0.0;
 	flip = false;
 	//this is reset: values being initialized only once. Startup values, whatever they are.
 	
diff --git a/plugins/WinVST/StereoFX/StereoFX.h b/plugins/WinVST/StereoFX/StereoFX.h
index 6748d1e..7a36059 100755
--- a/plugins/WinVST/StereoFX/StereoFX.h
+++ b/plugins/WinVST/StereoFX/StereoFX.h
@@ -56,10 +56,8 @@ private:
     
 	double iirSampleA;
 	double iirSampleB;
-	long double fpNShapeLA;
-	long double fpNShapeLB;
-	long double fpNShapeRA;
-	long double fpNShapeRB;
+	long double fpNShapeL;
+	long double fpNShapeR;
 	bool flip;
 	//default stuff
 
diff --git a/plugins/WinVST/StereoFX/StereoFXProc.cpp b/plugins/WinVST/StereoFX/StereoFXProc.cpp
index 49be44f..0e9de74 100755
--- a/plugins/WinVST/StereoFX/StereoFXProc.cpp
+++ b/plugins/WinVST/StereoFX/StereoFXProc.cpp
@@ -17,9 +17,6 @@ void StereoFX::processReplacing(float **inputs, float **outputs, VstInt32 sample
 	double overallscale = 1.0;
 	overallscale /= 44100.0;
 	overallscale *= getSampleRate();
-	float fpTemp;
-	long double fpOld = 0.618033988749894848204586; //golden ratio!
-	long double fpNew = 1.0 - fpOld;	
 	long double inputSampleL;
 	long double inputSampleR;
 	long double mid;
@@ -138,25 +135,14 @@ void StereoFX::processReplacing(float **inputs, float **outputs, VstInt32 sample
 		inputSampleL = (mid+side)/2.0;
 		inputSampleR = (mid-side)/2.0;
 		
-		//noise shaping to 32-bit floating point
-		if (flip) {
-			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;
-		}
-		flip = !flip;
-		//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;
@@ -178,9 +164,6 @@ void StereoFX::processDoubleReplacing(double **inputs, double **outputs, VstInt3
 	double overallscale = 1.0;
 	overallscale /= 44100.0;
 	overallscale *= getSampleRate();
-	double fpTemp;
-	long double fpOld = 0.618033988749894848204586; //golden ratio!
-	long double fpNew = 1.0 - fpOld;	
 	long double inputSampleL;
 	long double inputSampleR;
 	long double mid;
@@ -299,25 +282,16 @@ void StereoFX::processDoubleReplacing(double **inputs, double **outputs, VstInt3
 		inputSampleL = (mid+side)/2.0;
 		inputSampleR = (mid-side)/2.0;
 		
-		//noise shaping to 64-bit floating point
-		if (flip) {
-			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;
-		}
-		flip = !flip;
-		//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;
-- 
cgit v1.2.3