Floating Point Dither For All

6 files changed, 36 insertions, 69 deletions

diff --git a/plugins/MacVST/Desk/Desk.xcodeproj/christopherjohnson.pbxuser b/plugins/MacVST/Desk/Desk.xcodeproj/christopherjohnson.pbxuser
index 44f049e..9a65a01 100755
--- a/plugins/MacVST/Desk/Desk.xcodeproj/christopherjohnson.pbxuser
+++ b/plugins/MacVST/Desk/Desk.xcodeproj/christopherjohnson.pbxuser
@@ -2,7 +2,7 @@
 {
 	089C1669FE841209C02AAC07 /* Project object */ = {
 		activeBuildConfigurationName = Release;
-		activeTarget = 8D01CCC60486CAD60068D4B7 /* Desk */;
+		activeTarget = 8D01CCC60486CAD60068D4B7 /* AudioUnit */;
 		codeSenseManager = 8B02375F1D42B1C400E1E8C8 /* Code sense */;
 		perUserDictionary = {
 			PBXConfiguration.PBXFileTableDataSource3.PBXFileTableDataSource = {
@@ -49,8 +49,8 @@
 					PBXFileDataSource_Warnings_ColumnID,
 				);
 			};
-			PBXPerProjectTemplateStateSaveDate = 528459930;
-			PBXWorkspaceStateSaveDate = 528459930;
+			PBXPerProjectTemplateStateSaveDate = 569734422;
+			PBXWorkspaceStateSaveDate = 569734422;
 		};
 		sourceControlManager = 8B02375E1D42B1C400E1E8C8 /* Source Control */;
 		userBuildSettings = {
@@ -102,7 +102,7 @@
 		isa = PBXCodeSenseManager;
 		indexTemplatePath = "";
 	};
-	8D01CCC60486CAD60068D4B7 /* Desk */ = {
+	8D01CCC60486CAD60068D4B7 /* AudioUnit */ = {
 		activeExec = 0;
 	};
 }
diff --git a/plugins/MacVST/Desk/Desk.xcodeproj/christopherjohnson.perspectivev3 b/plugins/MacVST/Desk/Desk.xcodeproj/christopherjohnson.perspectivev3
index cc9907f..58a32ea 100755
--- a/plugins/MacVST/Desk/Desk.xcodeproj/christopherjohnson.perspectivev3
+++ b/plugins/MacVST/Desk/Desk.xcodeproj/christopherjohnson.perspectivev3
@@ -360,18 +360,18 @@
 							<key>GeometryConfiguration</key>
 							<dict>
 								<key>Frame</key>
-								<string>{{0, 0}, {603, 13}}</string>
+								<string>{{0, 0}, {603, 0}}</string>
 								<key>RubberWindowFrame</key>
 								<string>430 335 810 487 0 0 1440 878 </string>
 							</dict>
 							<key>Module</key>
 							<string>PBXNavigatorGroup</string>
 							<key>Proportion</key>
-							<string>13pt</string>
+							<string>0pt</string>
 						</dict>
 						<dict>
 							<key>Proportion</key>
-							<string>428pt</string>
+							<string>441pt</string>
 							<key>Tabs</key>
 							<array>
 								<dict>
@@ -385,7 +385,7 @@
 									<key>GeometryConfiguration</key>
 									<dict>
 										<key>Frame</key>
-										<string>{{10, 27}, {603, 401}}</string>
+										<string>{{10, 27}, {603, 414}}</string>
 										<key>RubberWindowFrame</key>
 										<string>430 335 810 487 0 0 1440 878 </string>
 									</dict>
@@ -469,11 +469,11 @@
 			</array>
 			<key>TableOfContents</key>
 			<array>
-				<string>8B9D793A1F7FA950007AB60F</string>
+				<string>8B7937D821F57520006E9731</string>
 				<string>1CA23ED40692098700951B8B</string>
-				<string>8B9D793B1F7FA950007AB60F</string>
+				<string>8B7937D921F57520006E9731</string>
 				<string>8B0237581D42B1C400E1E8C8</string>
-				<string>8B9D793C1F7FA950007AB60F</string>
+				<string>8B7937DA21F57520006E9731</string>
 				<string>1CA23EDF0692099D00951B8B</string>
 				<string>1CA23EE00692099D00951B8B</string>
 				<string>1CA23EE10692099D00951B8B</string>
@@ -626,7 +626,7 @@
 	<key>StatusbarIsVisible</key>
 	<true/>
 	<key>TimeStamp</key>
-	<real>528460112.51118302</real>
+	<real>569734432.71270597</real>
 	<key>ToolbarConfigUserDefaultsMinorVersion</key>
 	<string>2</string>
 	<key>ToolbarDisplayMode</key>
@@ -643,7 +643,6 @@
 	<integer>5</integer>
 	<key>WindowOrderList</key>
 	<array>
-		<string>8B9D793D1F7FA950007AB60F</string>
 		<string>/Users/christopherjohnson/Desktop/MacVST/Desk/Desk.xcodeproj</string>
 	</array>
 	<key>WindowString</key>
diff --git a/plugins/MacVST/Desk/Desk.xcodeproj/project.pbxproj b/plugins/MacVST/Desk/Desk.xcodeproj/project.pbxproj
index a170a5b..43a43a9 100755
--- a/plugins/MacVST/Desk/Desk.xcodeproj/project.pbxproj
+++ b/plugins/MacVST/Desk/Desk.xcodeproj/project.pbxproj
@@ -1894,7 +1894,7 @@
 /* End PBXHeadersBuildPhase section */
 
 /* Begin PBXNativeTarget section */
-		8D01CCC60486CAD60068D4B7 /* Desk */ = {
+		8D01CCC60486CAD60068D4B7 /* AudioUnit */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = 24BEAAED08919AE700E695F9 /* Build configuration list for PBXNativeTarget "Desk" */;
 			buildPhases = (
@@ -1947,7 +1947,7 @@
 			);
 			projectRoot = "";
 			targets = (
-				8D01CCC60486CAD60068D4B7 /* Desk */,
+				8D01CCC60486CAD60068D4B7 /* AudioUnit */,
 			);
 		};
 /* End PBXProject section */
diff --git a/plugins/MacVST/Desk/source/Desk.cpp b/plugins/MacVST/Desk/source/Desk.cpp
index 7a30943..9582f04 100755
--- a/plugins/MacVST/Desk/source/Desk.cpp
+++ b/plugins/MacVST/Desk/source/Desk.cpp
@@ -18,11 +18,8 @@ Desk::Desk(audioMasterCallback audioMaster) :
 	lastSampleR = 0.0;
 	lastOutSampleR = 0.0;
 	lastSlewR = 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/Desk/source/Desk.h b/plugins/MacVST/Desk/source/Desk.h
index 8c5c398..f7f933d 100755
--- a/plugins/MacVST/Desk/source/Desk.h
+++ b/plugins/MacVST/Desk/source/Desk.h
@@ -51,11 +51,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
 
 	long double lastSampleL;
diff --git a/plugins/MacVST/Desk/source/DeskProc.cpp b/plugins/MacVST/Desk/source/DeskProc.cpp
index a2bc92c..d53894b 100755
--- a/plugins/MacVST/Desk/source/DeskProc.cpp
+++ b/plugins/MacVST/Desk/source/DeskProc.cpp
@@ -29,9 +29,6 @@ void Desk::processReplacing(float **inputs, float **outputs, VstInt32 sampleFram
 	double bridgerectifier;
 	double combsample;
 	
-	float fpTemp;
-	long double fpOld = 0.618033988749894848204586; //golden ratio!
-	long double fpNew = 1.0 - fpOld;	
 
 	long double inputSampleL;
 	long double inputSampleR;
@@ -151,25 +148,14 @@ void Desk::processReplacing(float **inputs, float **outputs, VstInt32 sampleFram
 		inputSampleR /= gain;
 		//end R
 		
-		//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;
@@ -203,9 +189,6 @@ void Desk::processDoubleReplacing(double **inputs, double **outputs, VstInt32 sa
 	double bridgerectifier;
 	double combsample;
 	
-	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;
@@ -325,25 +308,16 @@ void Desk::processDoubleReplacing(double **inputs, double **outputs, VstInt32 sa
 		inputSampleR /= gain;
 		//end R
 
-		//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;