Floating Point Dither For All

6 files changed, 38 insertions, 71 deletions

diff --git a/plugins/MacVST/Average/Average.xcodeproj/christopherjohnson.pbxuser b/plugins/MacVST/Average/Average.xcodeproj/christopherjohnson.pbxuser
index cede59c..1b8551b 100755
--- a/plugins/MacVST/Average/Average.xcodeproj/christopherjohnson.pbxuser
+++ b/plugins/MacVST/Average/Average.xcodeproj/christopherjohnson.pbxuser
@@ -2,7 +2,7 @@
 {
 	089C1669FE841209C02AAC07 /* Project object */ = {
 		activeBuildConfigurationName = Release;
-		activeTarget = 8D01CCC60486CAD60068D4B7 /* Average */;
+		activeTarget = 8D01CCC60486CAD60068D4B7 /* AudioUnit */;
 		codeSenseManager = 8B02375F1D42B1C400E1E8C8 /* Code sense */;
 		perUserDictionary = {
 			PBXConfiguration.PBXFileTableDataSource3.PBXFileTableDataSource = {
@@ -49,8 +49,8 @@
 					PBXFileDataSource_Warnings_ColumnID,
 				);
 			};
-			PBXPerProjectTemplateStateSaveDate = 530376878;
-			PBXWorkspaceStateSaveDate = 530376878;
+			PBXPerProjectTemplateStateSaveDate = 569718186;
+			PBXWorkspaceStateSaveDate = 569718186;
 		};
 		sourceControlManager = 8B02375E1D42B1C400E1E8C8 /* Source Control */;
 		userBuildSettings = {
@@ -82,9 +82,9 @@
 	};
 	24D8286F09A914000093AEF8 /* AverageProc.cpp */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {848, 4719}}";
+			sepNavIntBoundsRect = "{{0, 0}, {848, 4329}}";
 			sepNavSelRange = "{9111, 0}";
-			sepNavVisRange = "{8668, 2468}";
+			sepNavVisRange = "{4985, 1917}";
 			sepNavWindowFrame = "{{460, 41}, {895, 831}}";
 		};
 	};
@@ -102,7 +102,7 @@
 		isa = PBXCodeSenseManager;
 		indexTemplatePath = "";
 	};
-	8D01CCC60486CAD60068D4B7 /* Average */ = {
+	8D01CCC60486CAD60068D4B7 /* AudioUnit */ = {
 		activeExec = 0;
 	};
 }
diff --git a/plugins/MacVST/Average/Average.xcodeproj/christopherjohnson.perspectivev3 b/plugins/MacVST/Average/Average.xcodeproj/christopherjohnson.perspectivev3
index 01ca524..53bb902 100755
--- a/plugins/MacVST/Average/Average.xcodeproj/christopherjohnson.perspectivev3
+++ b/plugins/MacVST/Average/Average.xcodeproj/christopherjohnson.perspectivev3
@@ -300,8 +300,9 @@
 							<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
 							<array>
 								<array>
-									<integer>10</integer>
-									<integer>9</integer>
+									<integer>6</integer>
+									<integer>4</integer>
+									<integer>0</integer>
 								</array>
 							</array>
 							<key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key>
@@ -468,11 +469,11 @@
 			</array>
 			<key>TableOfContents</key>
 			<array>
-				<string>8BB863411F9CE8E100FC8156</string>
+				<string>8B79340521F535C0006E9731</string>
 				<string>1CA23ED40692098700951B8B</string>
-				<string>8BB863421F9CE8E100FC8156</string>
+				<string>8B79340621F535C0006E9731</string>
 				<string>8B0237581D42B1C400E1E8C8</string>
-				<string>8BB863431F9CE8E100FC8156</string>
+				<string>8B79340721F535C0006E9731</string>
 				<string>1CA23EDF0692099D00951B8B</string>
 				<string>1CA23EE00692099D00951B8B</string>
 				<string>1CA23EE10692099D00951B8B</string>
@@ -625,7 +626,7 @@
 	<key>StatusbarIsVisible</key>
 	<true/>
 	<key>TimeStamp</key>
-	<real>530376929.99594998</real>
+	<real>569718208.35486102</real>
 	<key>ToolbarConfigUserDefaultsMinorVersion</key>
 	<string>2</string>
 	<key>ToolbarDisplayMode</key>
diff --git a/plugins/MacVST/Average/Average.xcodeproj/project.pbxproj b/plugins/MacVST/Average/Average.xcodeproj/project.pbxproj
index a4f3ebf..b01e8d9 100755
--- a/plugins/MacVST/Average/Average.xcodeproj/project.pbxproj
+++ b/plugins/MacVST/Average/Average.xcodeproj/project.pbxproj
@@ -1894,7 +1894,7 @@
 /* End PBXHeadersBuildPhase section */
 
 /* Begin PBXNativeTarget section */
-		8D01CCC60486CAD60068D4B7 /* Average */ = {
+		8D01CCC60486CAD60068D4B7 /* AudioUnit */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = 24BEAAED08919AE700E695F9 /* Build configuration list for PBXNativeTarget "Average" */;
 			buildPhases = (
@@ -1947,7 +1947,7 @@
 			);
 			projectRoot = "";
 			targets = (
-				8D01CCC60486CAD60068D4B7 /* Average */,
+				8D01CCC60486CAD60068D4B7 /* AudioUnit */,
 			);
 		};
 /* End PBXProject section */
diff --git a/plugins/MacVST/Average/source/Average.cpp b/plugins/MacVST/Average/source/Average.cpp
index 945c76c..2f39ca1 100755
--- a/plugins/MacVST/Average/source/Average.cpp
+++ b/plugins/MacVST/Average/source/Average.cpp
@@ -17,11 +17,8 @@ Average::Average(audioMasterCallback audioMaster) :
 	
 	for(int count = 0; count < 11; count++) {bL[count] = 0.0; bR[count] = 0.0; f[count] = 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/Average/source/Average.h b/plugins/MacVST/Average/source/Average.h
index 7e4b25e..9932e99 100755
--- a/plugins/MacVST/Average/source/Average.h
+++ b/plugins/MacVST/Average/source/Average.h
@@ -57,11 +57,8 @@ private:
 	double f[11];		
 	double bR[11];
 	
-	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/Average/source/AverageProc.cpp b/plugins/MacVST/Average/source/AverageProc.cpp
index 2b1c355..17f4783 100755
--- a/plugins/MacVST/Average/source/AverageProc.cpp
+++ b/plugins/MacVST/Average/source/AverageProc.cpp
@@ -14,9 +14,6 @@ void Average::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;
 	
 	double correctionSample;
 	double accumulatorSampleL;
@@ -154,25 +151,14 @@ void Average::processReplacing(float **inputs, float **outputs, VstInt32 sampleF
 		//in the floating point system.
 		
 		
-		//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;
@@ -189,12 +175,7 @@ void Average::processDoubleReplacing(double **inputs, double **outputs, VstInt32
     double* in1  =  inputs[0];
     double* in2  =  inputs[1];
     double* out1 = outputs[0];
-    double* out2 = outputs[1];
-
-	double fpTemp;
-	long double fpOld = 0.618033988749894848204586; //golden ratio!
-	long double fpNew = 1.0 - fpOld;
-	
+    double* out2 = outputs[1];	
 	double correctionSample;
 	double accumulatorSampleL;
 	double accumulatorSampleR;
@@ -330,25 +311,16 @@ void Average::processDoubleReplacing(double **inputs, double **outputs, VstInt32
 		//if it 'won't change anything' but our sample might be at a very different scaling
 		//in the floating point system.
 		
-		//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;