Floating Point Dither For All

6 files changed, 43 insertions, 78 deletions

diff --git a/plugins/MacVST/SideDull/SideDull.xcodeproj/christopherjohnson.pbxuser b/plugins/MacVST/SideDull/SideDull.xcodeproj/christopherjohnson.pbxuser
index 6a2257b..4d8e56b 100755
--- a/plugins/MacVST/SideDull/SideDull.xcodeproj/christopherjohnson.pbxuser
+++ b/plugins/MacVST/SideDull/SideDull.xcodeproj/christopherjohnson.pbxuser
@@ -2,7 +2,7 @@
 {
 	089C1669FE841209C02AAC07 /* Project object */ = {
 		activeBuildConfigurationName = Release;
-		activeTarget = 8D01CCC60486CAD60068D4B7 /* AudioUnit */;
+		activeTarget = 8D01CCC60486CAD60068D4B7 /* SideDull */;
 		codeSenseManager = 8B02375F1D42B1C400E1E8C8 /* Code sense */;
 		perUserDictionary = {
 			PBXConfiguration.PBXFileTableDataSource3.PBXFileTableDataSource = {
@@ -49,8 +49,8 @@
 					PBXFileDataSource_Warnings_ColumnID,
 				);
 			};
-			PBXPerProjectTemplateStateSaveDate = 528461758;
-			PBXWorkspaceStateSaveDate = 528461758;
+			PBXPerProjectTemplateStateSaveDate = 569771557;
+			PBXWorkspaceStateSaveDate = 569771557;
 		};
 		sourceControlManager = 8B02375E1D42B1C400E1E8C8 /* Source Control */;
 		userBuildSettings = {
@@ -58,17 +58,17 @@
 	};
 	2407DEB6089929BA00EB68BF /* SideDull.cpp */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {848, 1625}}";
-			sepNavSelRange = "{3760, 0}";
-			sepNavVisRange = "{2540, 1852}";
+			sepNavIntBoundsRect = "{{0, 0}, {848, 1586}}";
+			sepNavSelRange = "{542, 0}";
+			sepNavVisRange = "{0, 2119}";
 			sepNavWindowFrame = "{{12, 47}, {895, 831}}";
 		};
 	};
 	245463B80991757100464AD3 /* SideDull.h */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {866, 871}}";
-			sepNavSelRange = "{2409, 0}";
-			sepNavVisRange = "{313, 2247}";
+			sepNavIntBoundsRect = "{{0, 0}, {866, 845}}";
+			sepNavSelRange = "{2482, 0}";
+			sepNavVisRange = "{280, 2228}";
 			sepNavWindowFrame = "{{20, 47}, {895, 831}}";
 		};
 	};
@@ -82,9 +82,9 @@
 	};
 	24D8286F09A914000093AEF8 /* SideDullProc.cpp */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {848, 2990}}";
+			sepNavIntBoundsRect = "{{0, 0}, {848, 2704}}";
 			sepNavSelRange = "{5347, 0}";
-			sepNavVisRange = "{0, 1946}";
+			sepNavVisRange = "{5028, 1960}";
 			sepNavWindowFrame = "{{430, 47}, {895, 831}}";
 		};
 	};
@@ -102,7 +102,7 @@
 		isa = PBXCodeSenseManager;
 		indexTemplatePath = "";
 	};
-	8D01CCC60486CAD60068D4B7 /* AudioUnit */ = {
+	8D01CCC60486CAD60068D4B7 /* SideDull */ = {
 		activeExec = 0;
 	};
 }
diff --git a/plugins/MacVST/SideDull/SideDull.xcodeproj/christopherjohnson.perspectivev3 b/plugins/MacVST/SideDull/SideDull.xcodeproj/christopherjohnson.perspectivev3
index a8f957e..d35103a 100755
--- a/plugins/MacVST/SideDull/SideDull.xcodeproj/christopherjohnson.perspectivev3
+++ b/plugins/MacVST/SideDull/SideDull.xcodeproj/christopherjohnson.perspectivev3
@@ -386,8 +386,6 @@
 									<dict>
 										<key>Frame</key>
 										<string>{{10, 27}, {603, 414}}</string>
-										<key>RubberWindowFrame</key>
-										<string>428 317 810 487 0 0 1440 878 </string>
 									</dict>
 									<key>Module</key>
 									<string>XCDetailModule</string>
@@ -441,7 +439,9 @@
 									<key>GeometryConfiguration</key>
 									<dict>
 										<key>Frame</key>
-										<string>{{10, 27}, {603, 282}}</string>
+										<string>{{10, 27}, {603, 414}}</string>
+										<key>RubberWindowFrame</key>
+										<string>428 317 810 487 0 0 1440 878 </string>
 									</dict>
 									<key>Module</key>
 									<string>PBXBuildResultsModule</string>
@@ -469,11 +469,11 @@
 			</array>
 			<key>TableOfContents</key>
 			<array>
-				<string>8B9D7D891F7FAFCE007AB60F</string>
+				<string>8B793F6821F60667006E9731</string>
 				<string>1CA23ED40692098700951B8B</string>
-				<string>8B9D7D8A1F7FAFCE007AB60F</string>
+				<string>8B793F6921F60667006E9731</string>
 				<string>8B0237581D42B1C400E1E8C8</string>
-				<string>8B9D7D8B1F7FAFCE007AB60F</string>
+				<string>8B793F6A21F60667006E9731</string>
 				<string>1CA23EDF0692099D00951B8B</string>
 				<string>1CA23EE00692099D00951B8B</string>
 				<string>1CA23EE10692099D00951B8B</string>
@@ -626,7 +626,7 @@
 	<key>StatusbarIsVisible</key>
 	<true/>
 	<key>TimeStamp</key>
-	<real>528461774.64021301</real>
+	<real>569771623.27479804</real>
 	<key>ToolbarConfigUserDefaultsMinorVersion</key>
 	<string>2</string>
 	<key>ToolbarDisplayMode</key>
@@ -643,7 +643,6 @@
 	<integer>5</integer>
 	<key>WindowOrderList</key>
 	<array>
-		<string>8B9D7D8C1F7FAFCE007AB60F</string>
 		<string>/Users/christopherjohnson/Desktop/MacVST/SideDull/SideDull.xcodeproj</string>
 	</array>
 	<key>WindowString</key>
diff --git a/plugins/MacVST/SideDull/SideDull.xcodeproj/project.pbxproj b/plugins/MacVST/SideDull/SideDull.xcodeproj/project.pbxproj
index ba99bc0..7e35731 100755
--- a/plugins/MacVST/SideDull/SideDull.xcodeproj/project.pbxproj
+++ b/plugins/MacVST/SideDull/SideDull.xcodeproj/project.pbxproj
@@ -1894,7 +1894,7 @@
 /* End PBXHeadersBuildPhase section */
 
 /* Begin PBXNativeTarget section */
-		8D01CCC60486CAD60068D4B7 /* AudioUnit */ = {
+		8D01CCC60486CAD60068D4B7 /* SideDull */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = 24BEAAED08919AE700E695F9 /* Build configuration list for PBXNativeTarget "SideDull" */;
 			buildPhases = (
@@ -1947,7 +1947,7 @@
 			);
 			projectRoot = "";
 			targets = (
-				8D01CCC60486CAD60068D4B7 /* AudioUnit */,
+				8D01CCC60486CAD60068D4B7 /* SideDull */,
 			);
 		};
 /* End PBXProject section */
diff --git a/plugins/MacVST/SideDull/source/SideDull.cpp b/plugins/MacVST/SideDull/source/SideDull.cpp
index 547f1fd..479bdfd 100755
--- a/plugins/MacVST/SideDull/source/SideDull.cpp
+++ b/plugins/MacVST/SideDull/source/SideDull.cpp
@@ -16,10 +16,8 @@ SideDull::SideDull(audioMasterCallback audioMaster) :
 	iirSampleA = 0.0;
 	iirSampleB = 0.0;
 	flip = true;
-	fpNShapeAL = 0.0;
-	fpNShapeBL = 0.0;
-	fpNShapeAR = 0.0;
-	fpNShapeBR = 0.0;
+	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/SideDull/source/SideDull.h b/plugins/MacVST/SideDull/source/SideDull.h
index 6f431ac..ef5e892 100755
--- a/plugins/MacVST/SideDull/source/SideDull.h
+++ b/plugins/MacVST/SideDull/source/SideDull.h
@@ -55,10 +55,8 @@ private:
 	double iirSampleA;
 	double iirSampleB;
 	bool flip;
-	long double fpNShapeAL;
-	long double fpNShapeBL;
-	long double fpNShapeAR;
-	long double fpNShapeBR;
+	long double fpNShapeL;
+	long double fpNShapeR;
 	
     float A;
 };
diff --git a/plugins/MacVST/SideDull/source/SideDullProc.cpp b/plugins/MacVST/SideDull/source/SideDullProc.cpp
index 347e5e8..7b77744 100755
--- a/plugins/MacVST/SideDull/source/SideDullProc.cpp
+++ b/plugins/MacVST/SideDull/source/SideDullProc.cpp
@@ -17,9 +17,6 @@ void SideDull::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;
@@ -88,27 +85,14 @@ void SideDull::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;
-			fpNShapeAL = (fpNShapeAL*fpOld)+((inputSampleL-fpTemp)*fpNew);
-			inputSampleL += fpNShapeAL;
-			
-			fpTemp = inputSampleR;
-			fpNShapeAR = (fpNShapeAR*fpOld)+((inputSampleR-fpTemp)*fpNew);
-			inputSampleR += fpNShapeAR;
-		}
-		else {
-			fpTemp = inputSampleL;
-			fpNShapeBL = (fpNShapeBL*fpOld)+((inputSampleL-fpTemp)*fpNew);
-			inputSampleL += fpNShapeBL;
-			
-			fpTemp = inputSampleR;
-			fpNShapeBR = (fpNShapeBR*fpOld)+((inputSampleR-fpTemp)*fpNew);
-			inputSampleR += fpNShapeBR;
-		}
-		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;
@@ -130,9 +114,6 @@ void SideDull::processDoubleReplacing(double **inputs, double **outputs, VstInt3
 	double overallscale = 1.0;
 	overallscale /= 44100.0;
 	overallscale *= getSampleRate();
-	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;
@@ -201,27 +182,16 @@ void SideDull::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;
-			fpNShapeAL = (fpNShapeAL*fpOld)+((inputSampleL-fpTemp)*fpNew);
-			inputSampleL += fpNShapeAL;
-			
-			fpTemp = inputSampleR;
-			fpNShapeAR = (fpNShapeAR*fpOld)+((inputSampleR-fpTemp)*fpNew);
-			inputSampleR += fpNShapeAR;
-		}
-		else {
-			fpTemp = inputSampleL;
-			fpNShapeBL = (fpNShapeBL*fpOld)+((inputSampleL-fpTemp)*fpNew);
-			inputSampleL += fpNShapeBL;
-			
-			fpTemp = inputSampleR;
-			fpNShapeBR = (fpNShapeBR*fpOld)+((inputSampleR-fpTemp)*fpNew);
-			inputSampleR += fpNShapeBR;
-		}
-		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;