Floating Point Dither For All

5 files changed, 32 insertions, 65 deletions

diff --git a/plugins/MacVST/MidSide/MidSide.xcodeproj/christopherjohnson.pbxuser b/plugins/MacVST/MidSide/MidSide.xcodeproj/christopherjohnson.pbxuser
index ec9df9a..62992ba 100755
--- a/plugins/MacVST/MidSide/MidSide.xcodeproj/christopherjohnson.pbxuser
+++ b/plugins/MacVST/MidSide/MidSide.xcodeproj/christopherjohnson.pbxuser
@@ -51,11 +51,11 @@
 					PBXFileDataSource_Warnings_ColumnID,
 				);
 			};
-			PBXPerProjectTemplateStateSaveDate = 528461091;
-			PBXWorkspaceStateSaveDate = 528461091;
+			PBXPerProjectTemplateStateSaveDate = 569770425;
+			PBXWorkspaceStateSaveDate = 569770425;
 		};
 		perUserProjectItems = {
-			8B9D6E101F7EF349007AB60F /* PBXTextBookmark */ = 8B9D6E101F7EF349007AB60F /* PBXTextBookmark */;
+			8B793CDA21F601C2006E9731 /* PBXTextBookmark */ = 8B793CDA21F601C2006E9731 /* PBXTextBookmark */;
 			8B9D7BED1F7FAD3F007AB60F /* PBXTextBookmark */ = 8B9D7BED1F7FAD3F007AB60F /* PBXTextBookmark */;
 		};
 		sourceControlManager = 8B02375E1D42B1C400E1E8C8 /* Source Control */;
@@ -108,7 +108,7 @@
 		isa = PBXCodeSenseManager;
 		indexTemplatePath = "";
 	};
-	8B9D6E101F7EF349007AB60F /* PBXTextBookmark */ = {
+	8B793CDA21F601C2006E9731 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 24A2FFDB0F90D1DD003BB5A7 /* audioeffectx.cpp */;
 		name = "audioeffectx.cpp: 307";
diff --git a/plugins/MacVST/MidSide/MidSide.xcodeproj/christopherjohnson.perspectivev3 b/plugins/MacVST/MidSide/MidSide.xcodeproj/christopherjohnson.perspectivev3
index b6def9d..721ff92 100755
--- a/plugins/MacVST/MidSide/MidSide.xcodeproj/christopherjohnson.perspectivev3
+++ b/plugins/MacVST/MidSide/MidSide.xcodeproj/christopherjohnson.perspectivev3
@@ -351,10 +351,10 @@
 										<key>_historyCapacity</key>
 										<integer>0</integer>
 										<key>bookmark</key>
-										<string>8B9D7BED1F7FAD3F007AB60F</string>
+										<string>8B793CDA21F601C2006E9731</string>
 										<key>history</key>
 										<array>
-											<string>8B9D6E101F7EF349007AB60F</string>
+											<string>8B9D7BED1F7FAD3F007AB60F</string>
 										</array>
 									</dict>
 									<key>SplitCount</key>
@@ -477,11 +477,11 @@
 			</array>
 			<key>TableOfContents</key>
 			<array>
-				<string>8B9D7BEE1F7FAD3F007AB60F</string>
+				<string>8B793CDB21F601C2006E9731</string>
 				<string>1CA23ED40692098700951B8B</string>
-				<string>8B9D7BEF1F7FAD3F007AB60F</string>
+				<string>8B793CDC21F601C2006E9731</string>
 				<string>8B0237581D42B1C400E1E8C8</string>
-				<string>8B9D7BF01F7FAD3F007AB60F</string>
+				<string>8B793CDD21F601C2006E9731</string>
 				<string>1CA23EDF0692099D00951B8B</string>
 				<string>1CA23EE00692099D00951B8B</string>
 				<string>1CA23EE10692099D00951B8B</string>
@@ -654,7 +654,7 @@
 	<key>StatusbarIsVisible</key>
 	<true/>
 	<key>TimeStamp</key>
-	<real>528461119.98817199</real>
+	<real>569770434.56493402</real>
 	<key>ToolbarConfigUserDefaultsMinorVersion</key>
 	<string>2</string>
 	<key>ToolbarDisplayMode</key>
@@ -671,7 +671,6 @@
 	<integer>5</integer>
 	<key>WindowOrderList</key>
 	<array>
-		<string>8B9D7BF11F7FAD3F007AB60F</string>
 		<string>/Users/christopherjohnson/Desktop/MacVST/MidSide/MidSide.xcodeproj</string>
 	</array>
 	<key>WindowString</key>
diff --git a/plugins/MacVST/MidSide/source/MidSide.cpp b/plugins/MacVST/MidSide/source/MidSide.cpp
index bc37393..8f61cff 100755
--- a/plugins/MacVST/MidSide/source/MidSide.cpp
+++ b/plugins/MacVST/MidSide/source/MidSide.cpp
@@ -13,11 +13,8 @@ MidSide::MidSide(audioMasterCallback audioMaster) :
     AudioEffectX(audioMaster, kNumPrograms, kNumParameters)
 {
 	A = 0.5;
-	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/MidSide/source/MidSide.h b/plugins/MacVST/MidSide/source/MidSide.h
index 28b2ae7..4d139c8 100755
--- a/plugins/MacVST/MidSide/source/MidSide.h
+++ b/plugins/MacVST/MidSide/source/MidSide.h
@@ -52,11 +52,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;
diff --git a/plugins/MacVST/MidSide/source/MidSideProc.cpp b/plugins/MacVST/MidSide/source/MidSideProc.cpp
index 2df14f4..cca7a5c 100755
--- a/plugins/MacVST/MidSide/source/MidSideProc.cpp
+++ b/plugins/MacVST/MidSide/source/MidSideProc.cpp
@@ -14,9 +14,6 @@ void MidSide::processReplacing(float **inputs, float **outputs, VstInt32 sampleF
     float* out1 = outputs[0];
     float* out2 = outputs[1];
 
-	float fpTemp;
-	long double fpOld = 0.618033988749894848204586; //golden ratio!
-	long double fpNew = 1.0 - fpOld;	
 
 	long double inputSampleL;
 	long double inputSampleR;
@@ -76,25 +73,14 @@ void MidSide::processReplacing(float **inputs, float **outputs, VstInt32 sampleF
 		mid *= midgain;
 		side *= sidegain;
 		
-		//noise shaping to 32-bit floating point
-		if (fpFlip) {
-			fpTemp = mid;
-			fpNShapeLA = (fpNShapeLA*fpOld)+((mid-fpTemp)*fpNew);
-			mid += fpNShapeLA;
-			fpTemp = side;
-			fpNShapeRA = (fpNShapeRA*fpOld)+((side-fpTemp)*fpNew);
-			side += fpNShapeRA;
-		}
-		else {
-			fpTemp = mid;
-			fpNShapeLB = (fpNShapeLB*fpOld)+((mid-fpTemp)*fpNew);
-			mid += fpNShapeLB;
-			fpTemp = side;
-			fpNShapeRB = (fpNShapeRB*fpOld)+((side-fpTemp)*fpNew);
-			side += fpNShapeRB;
-		}
-		fpFlip = !fpFlip;
-		//end noise shaping on 32 bit output
+		//stereo 32 bit dither, made small and tidy.
+		int expon; frexpf((float)mid, &expon);
+		long double dither = (rand()/(RAND_MAX*7.737125245533627e+25))*pow(2,expon+62);
+		mid += (dither-fpNShapeL); fpNShapeL = dither;
+		frexpf((float)side, &expon);
+		dither = (rand()/(RAND_MAX*7.737125245533627e+25))*pow(2,expon+62);
+		side += (dither-fpNShapeR); fpNShapeR = dither;
+		//end 32 bit dither
 		
 		*out1 = mid;
 		*out2 = side;
@@ -113,9 +99,6 @@ void MidSide::processDoubleReplacing(double **inputs, double **outputs, VstInt32
     double* out1 = outputs[0];
     double* out2 = outputs[1];
 
-	double fpTemp; //this is different from singlereplacing
-	long double fpOld = 0.618033988749894848204586; //golden ratio!
-	long double fpNew = 1.0 - fpOld;	
 
 	long double inputSampleL;
 	long double inputSampleR;
@@ -175,25 +158,16 @@ void MidSide::processDoubleReplacing(double **inputs, double **outputs, VstInt32
 		mid *= midgain;
 		side *= sidegain;
 		
-		//noise shaping to 64-bit floating point
-		if (fpFlip) {
-			fpTemp = mid;
-			fpNShapeLA = (fpNShapeLA*fpOld)+((mid-fpTemp)*fpNew);
-			mid += fpNShapeLA;
-			fpTemp = side;
-			fpNShapeRA = (fpNShapeRA*fpOld)+((side-fpTemp)*fpNew);
-			side += fpNShapeRA;
-		}
-		else {
-			fpTemp = mid;
-			fpNShapeLB = (fpNShapeLB*fpOld)+((mid-fpTemp)*fpNew);
-			mid += fpNShapeLB;
-			fpTemp = side;
-			fpNShapeRB = (fpNShapeRB*fpOld)+((side-fpTemp)*fpNew);
-			side += fpNShapeRB;
-		}
-		fpFlip = !fpFlip;
-		//end noise shaping on 64 bit output
+		//stereo 64 bit dither, made small and tidy.
+		int expon; frexp((double)mid, &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
+		mid += (dither-fpNShapeL); fpNShapeL = dither;
+		frexp((double)side, &expon);
+		dither = (rand()/(RAND_MAX*7.737125245533627e+25))*pow(2,expon+62);
+		dither /= 536870912.0; //needs this to scale to 64 bit zone
+		side += (dither-fpNShapeR); fpNShapeR = dither;
+		//end 64 bit dither
 		
 		*out1 = mid;
 		*out2 = side;