Floating Point Dither For All

15 files changed, 46 insertions, 78 deletions

diff --git a/plugins/MacVST/GrooveWear/GrooveWear.xcodeproj/christopherjohnson.pbxuser b/plugins/MacVST/GrooveWear/GrooveWear.xcodeproj/christopherjohnson.pbxuser
index 32ae3e2..d93196d 100644..100755
--- a/plugins/MacVST/GrooveWear/GrooveWear.xcodeproj/christopherjohnson.pbxuser
+++ b/plugins/MacVST/GrooveWear/GrooveWear.xcodeproj/christopherjohnson.pbxuser
@@ -2,7 +2,7 @@
 {
 	089C1669FE841209C02AAC07 /* Project object */ = {
 		activeBuildConfigurationName = Release;
-		activeTarget = 8D01CCC60486CAD60068D4B7 /* GrooveWear */;
+		activeTarget = 8D01CCC60486CAD60068D4B7 /* AudioUnit */;
 		codeSenseManager = 8B02375F1D42B1C400E1E8C8 /* Code sense */;
 		perUserDictionary = {
 			PBXConfiguration.PBXFileTableDataSource3.PBXFileTableDataSource = {
@@ -49,8 +49,8 @@
 					PBXFileDataSource_Warnings_ColumnID,
 				);
 			};
-			PBXPerProjectTemplateStateSaveDate = 538681972;
-			PBXWorkspaceStateSaveDate = 538681972;
+			PBXPerProjectTemplateStateSaveDate = 569735642;
+			PBXWorkspaceStateSaveDate = 569735642;
 		};
 		sourceControlManager = 8B02375E1D42B1C400E1E8C8 /* Source Control */;
 		userBuildSettings = {
@@ -58,18 +58,18 @@
 	};
 	2407DEB6089929BA00EB68BF /* GrooveWear.cpp */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {848, 1976}}";
-			sepNavSelRange = "{853, 0}";
-			sepNavVisRange = "{3082, 2076}";
-			sepNavWindowFrame = "{{12, 47}, {895, 831}}";
+			sepNavIntBoundsRect = "{{0, 0}, {848, 1989}}";
+			sepNavSelRange = "{3622, 151}";
+			sepNavVisRange = "{2572, 2004}";
+			sepNavWindowFrame = "{{538, 47}, {895, 831}}";
 		};
 	};
 	245463B80991757100464AD3 /* GrooveWear.h */ = {
 		uiCtxt = {
 			sepNavIntBoundsRect = "{{0, 0}, {866, 1144}}";
-			sepNavSelRange = "{2839, 0}";
+			sepNavSelRange = "{2541, 368}";
 			sepNavVisRange = "{708, 2201}";
-			sepNavWindowFrame = "{{20, 47}, {895, 831}}";
+			sepNavWindowFrame = "{{548, 47}, {895, 831}}";
 		};
 	};
 	24A2FFDB0F90D1DD003BB5A7 /* audioeffectx.cpp */ = {
@@ -82,10 +82,10 @@
 	};
 	24D8286F09A914000093AEF8 /* GrooveWearProc.cpp */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {876, 12779}}";
-			sepNavSelRange = "{41930, 0}";
+			sepNavIntBoundsRect = "{{0, 0}, {876, 11960}}";
+			sepNavSelRange = "{21536, 21122}";
 			sepNavVisRange = "{40820, 1838}";
-			sepNavWindowFrame = "{{222, 39}, {923, 828}}";
+			sepNavWindowFrame = "{{523, 50}, {923, 828}}";
 		};
 	};
 	8B02375E1D42B1C400E1E8C8 /* Source Control */ = {
@@ -102,7 +102,7 @@
 		isa = PBXCodeSenseManager;
 		indexTemplatePath = "";
 	};
-	8D01CCC60486CAD60068D4B7 /* GrooveWear */ = {
+	8D01CCC60486CAD60068D4B7 /* AudioUnit */ = {
 		activeExec = 0;
 	};
 }
diff --git a/plugins/MacVST/GrooveWear/GrooveWear.xcodeproj/christopherjohnson.perspectivev3 b/plugins/MacVST/GrooveWear/GrooveWear.xcodeproj/christopherjohnson.perspectivev3
index 4a8fe96..c016b37 100644..100755
--- a/plugins/MacVST/GrooveWear/GrooveWear.xcodeproj/christopherjohnson.perspectivev3
+++ b/plugins/MacVST/GrooveWear/GrooveWear.xcodeproj/christopherjohnson.perspectivev3
@@ -323,7 +323,7 @@
 							<real>185</real>
 						</array>
 						<key>RubberWindowFrame</key>
-						<string>21 368 810 487 0 0 1440 878 </string>
+						<string>630 296 810 487 0 0 1440 878 </string>
 					</dict>
 					<key>Module</key>
 					<string>PBXSmartGroupTreeModule</string>
@@ -362,7 +362,7 @@
 								<key>Frame</key>
 								<string>{{0, 0}, {603, 0}}</string>
 								<key>RubberWindowFrame</key>
-								<string>21 368 810 487 0 0 1440 878 </string>
+								<string>630 296 810 487 0 0 1440 878 </string>
 							</dict>
 							<key>Module</key>
 							<string>PBXNavigatorGroup</string>
@@ -387,7 +387,7 @@
 										<key>Frame</key>
 										<string>{{10, 27}, {603, 414}}</string>
 										<key>RubberWindowFrame</key>
-										<string>21 368 810 487 0 0 1440 878 </string>
+										<string>630 296 810 487 0 0 1440 878 </string>
 									</dict>
 									<key>Module</key>
 									<string>XCDetailModule</string>
@@ -469,11 +469,11 @@
 			</array>
 			<key>TableOfContents</key>
 			<array>
-				<string>8B4E5432201BA7F900B5DC2A</string>
+				<string>8B793B0821F579E6006E9731</string>
 				<string>1CA23ED40692098700951B8B</string>
-				<string>8B4E5433201BA7F900B5DC2A</string>
+				<string>8B793B0921F579E6006E9731</string>
 				<string>8B0237581D42B1C400E1E8C8</string>
-				<string>8B4E5434201BA7F900B5DC2A</string>
+				<string>8B793B0A21F579E6006E9731</string>
 				<string>1CA23EDF0692099D00951B8B</string>
 				<string>1CA23EE00692099D00951B8B</string>
 				<string>1CA23EE10692099D00951B8B</string>
@@ -626,7 +626,7 @@
 	<key>StatusbarIsVisible</key>
 	<true/>
 	<key>TimeStamp</key>
-	<real>538683385.46335804</real>
+	<real>569735654.76659203</real>
 	<key>ToolbarConfigUserDefaultsMinorVersion</key>
 	<string>2</string>
 	<key>ToolbarDisplayMode</key>
@@ -643,10 +643,10 @@
 	<integer>5</integer>
 	<key>WindowOrderList</key>
 	<array>
-		<string>/Users/christopherjohnson/Desktop/GrooveWear/GrooveWear.xcodeproj</string>
+		<string>/Users/christopherjohnson/Desktop/MacVST/GrooveWear/GrooveWear.xcodeproj</string>
 	</array>
 	<key>WindowString</key>
-	<string>21 368 810 487 0 0 1440 878 </string>
+	<string>630 296 810 487 0 0 1440 878 </string>
 	<key>WindowToolsV3</key>
 	<array>
 		<dict>
diff --git a/plugins/MacVST/GrooveWear/GrooveWear.xcodeproj/project.pbxproj b/plugins/MacVST/GrooveWear/GrooveWear.xcodeproj/project.pbxproj
index 0dd9583..e19f322 100755
--- a/plugins/MacVST/GrooveWear/GrooveWear.xcodeproj/project.pbxproj
+++ b/plugins/MacVST/GrooveWear/GrooveWear.xcodeproj/project.pbxproj
@@ -1894,7 +1894,7 @@
 /* End PBXHeadersBuildPhase section */
 
 /* Begin PBXNativeTarget section */
-		8D01CCC60486CAD60068D4B7 /* GrooveWear */ = {
+		8D01CCC60486CAD60068D4B7 /* AudioUnit */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = 24BEAAED08919AE700E695F9 /* Build configuration list for PBXNativeTarget "GrooveWear" */;
 			buildPhases = (
@@ -1947,7 +1947,7 @@
 			);
 			projectRoot = "";
 			targets = (
-				8D01CCC60486CAD60068D4B7 /* GrooveWear */,
+				8D01CCC60486CAD60068D4B7 /* AudioUnit */,
 			);
 		};
 /* End PBXProject section */
diff --git a/plugins/MacVST/GrooveWear/GrooveWear.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/plugins/MacVST/GrooveWear/GrooveWear.xcodeproj/project.xcworkspace/contents.xcworkspacedata
index a80c038..a80c038 100644..100755
--- a/plugins/MacVST/GrooveWear/GrooveWear.xcodeproj/project.xcworkspace/contents.xcworkspacedata
+++ b/plugins/MacVST/GrooveWear/GrooveWear.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/plugins/MacVST/GrooveWear/GrooveWear.xcodeproj/project.xcworkspace/xcuserdata/christopherjohnson.xcuserdatad/UserInterfaceState.xcuserstate b/plugins/MacVST/GrooveWear/GrooveWear.xcodeproj/project.xcworkspace/xcuserdata/christopherjohnson.xcuserdatad/UserInterfaceState.xcuserstate
index 5c38f94..5c38f94 100644..100755
--- a/plugins/MacVST/GrooveWear/GrooveWear.xcodeproj/project.xcworkspace/xcuserdata/christopherjohnson.xcuserdatad/UserInterfaceState.xcuserstate
+++ b/plugins/MacVST/GrooveWear/GrooveWear.xcodeproj/project.xcworkspace/xcuserdata/christopherjohnson.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/plugins/MacVST/GrooveWear/GrooveWear.xcodeproj/project.xcworkspace/xcuserdata/spiadmin.xcuserdatad/UserInterfaceState.xcuserstate b/plugins/MacVST/GrooveWear/GrooveWear.xcodeproj/project.xcworkspace/xcuserdata/spiadmin.xcuserdatad/UserInterfaceState.xcuserstate
index 314de0f..314de0f 100644..100755
--- a/plugins/MacVST/GrooveWear/GrooveWear.xcodeproj/project.xcworkspace/xcuserdata/spiadmin.xcuserdatad/UserInterfaceState.xcuserstate
+++ b/plugins/MacVST/GrooveWear/GrooveWear.xcodeproj/project.xcworkspace/xcuserdata/spiadmin.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/plugins/MacVST/GrooveWear/GrooveWear.xcodeproj/spiadmin.mode1v3 b/plugins/MacVST/GrooveWear/GrooveWear.xcodeproj/spiadmin.mode1v3
index c572326..c572326 100644..100755
--- a/plugins/MacVST/GrooveWear/GrooveWear.xcodeproj/spiadmin.mode1v3
+++ b/plugins/MacVST/GrooveWear/GrooveWear.xcodeproj/spiadmin.mode1v3
diff --git a/plugins/MacVST/GrooveWear/GrooveWear.xcodeproj/spiadmin.pbxuser b/plugins/MacVST/GrooveWear/GrooveWear.xcodeproj/spiadmin.pbxuser
index df94780..df94780 100644..100755
--- a/plugins/MacVST/GrooveWear/GrooveWear.xcodeproj/spiadmin.pbxuser
+++ b/plugins/MacVST/GrooveWear/GrooveWear.xcodeproj/spiadmin.pbxuser
diff --git a/plugins/MacVST/GrooveWear/GrooveWear.xcodeproj/xcuserdata/christopherjohnson.xcuserdatad/xcschemes/Gain.xcscheme b/plugins/MacVST/GrooveWear/GrooveWear.xcodeproj/xcuserdata/christopherjohnson.xcuserdatad/xcschemes/Gain.xcscheme
index 8ee693f..8ee693f 100644..100755
--- a/plugins/MacVST/GrooveWear/GrooveWear.xcodeproj/xcuserdata/christopherjohnson.xcuserdatad/xcschemes/Gain.xcscheme
+++ b/plugins/MacVST/GrooveWear/GrooveWear.xcodeproj/xcuserdata/christopherjohnson.xcuserdatad/xcschemes/Gain.xcscheme
diff --git a/plugins/MacVST/GrooveWear/GrooveWear.xcodeproj/xcuserdata/christopherjohnson.xcuserdatad/xcschemes/xcschememanagement.plist b/plugins/MacVST/GrooveWear/GrooveWear.xcodeproj/xcuserdata/christopherjohnson.xcuserdatad/xcschemes/xcschememanagement.plist
index 5bccbcb..5bccbcb 100644..100755
--- a/plugins/MacVST/GrooveWear/GrooveWear.xcodeproj/xcuserdata/christopherjohnson.xcuserdatad/xcschemes/xcschememanagement.plist
+++ b/plugins/MacVST/GrooveWear/GrooveWear.xcodeproj/xcuserdata/christopherjohnson.xcuserdatad/xcschemes/xcschememanagement.plist
diff --git a/plugins/MacVST/GrooveWear/GrooveWear.xcodeproj/xcuserdata/spiadmin.xcuserdatad/xcschemes/xcschememanagement.plist b/plugins/MacVST/GrooveWear/GrooveWear.xcodeproj/xcuserdata/spiadmin.xcuserdatad/xcschemes/xcschememanagement.plist
index a7bdd62..a7bdd62 100644..100755
--- a/plugins/MacVST/GrooveWear/GrooveWear.xcodeproj/xcuserdata/spiadmin.xcuserdatad/xcschemes/xcschememanagement.plist
+++ b/plugins/MacVST/GrooveWear/GrooveWear.xcodeproj/xcuserdata/spiadmin.xcuserdatad/xcschemes/xcschememanagement.plist
diff --git a/plugins/MacVST/GrooveWear/GrooveWear.xcodeproj/xcuserdata/spiadmin.xcuserdatad/xcschemes/«PROJECTNAME».xcscheme b/plugins/MacVST/GrooveWear/GrooveWear.xcodeproj/xcuserdata/spiadmin.xcuserdatad/xcschemes/«PROJECTNAME».xcscheme
index 0df2de4..0df2de4 100644..100755
--- a/plugins/MacVST/GrooveWear/GrooveWear.xcodeproj/xcuserdata/spiadmin.xcuserdatad/xcschemes/«PROJECTNAME».xcscheme
+++ b/plugins/MacVST/GrooveWear/GrooveWear.xcodeproj/xcuserdata/spiadmin.xcuserdatad/xcschemes/«PROJECTNAME».xcscheme
diff --git a/plugins/MacVST/GrooveWear/source/GrooveWear.cpp b/plugins/MacVST/GrooveWear/source/GrooveWear.cpp
index e553daa..cbe1fc5 100755
--- a/plugins/MacVST/GrooveWear/source/GrooveWear.cpp
+++ b/plugins/MacVST/GrooveWear/source/GrooveWear.cpp
@@ -36,11 +36,8 @@ GrooveWear::GrooveWear(audioMasterCallback audioMaster) :
 	cMidPrevR = 0.0;
 	dMidPrevR = 0.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/GrooveWear/source/GrooveWear.h b/plugins/MacVST/GrooveWear/source/GrooveWear.h
index 7b933c2..4bf9745 100755
--- a/plugins/MacVST/GrooveWear/source/GrooveWear.h
+++ b/plugins/MacVST/GrooveWear/source/GrooveWear.h
@@ -53,11 +53,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
 	
 	double aMidL[21];
diff --git a/plugins/MacVST/GrooveWear/source/GrooveWearProc.cpp b/plugins/MacVST/GrooveWear/source/GrooveWearProc.cpp
index a22f6df..e663203 100755
--- a/plugins/MacVST/GrooveWear/source/GrooveWearProc.cpp
+++ b/plugins/MacVST/GrooveWear/source/GrooveWearProc.cpp
@@ -14,9 +14,6 @@ void GrooveWear::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;	
 
 	double overallscale = (pow(A,2)*19.0)+1.0;
 	double gain = overallscale;
@@ -433,25 +430,14 @@ void GrooveWear::processReplacing(float **inputs, float **outputs, VstInt32 samp
 			drySampleR = inputSampleR;
 		}
 		
-		//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;
@@ -470,9 +456,6 @@ void GrooveWear::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;	
 	
 	double overallscale = (pow(A,2)*19.0)+1.0;
 	double gain = overallscale;
@@ -889,25 +872,16 @@ void GrooveWear::processDoubleReplacing(double **inputs, double **outputs, VstIn
 			drySampleR = inputSampleR;
 		}
 		
-		//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;