Floating Point Dither For All

5 files changed, 41 insertions, 75 deletions

diff --git a/plugins/MacVST/Console4Channel/Console4Channel.xcodeproj/christopherjohnson.pbxuser b/plugins/MacVST/Console4Channel/Console4Channel.xcodeproj/christopherjohnson.pbxuser
index ae8e6d9..b06954f 100755
--- a/plugins/MacVST/Console4Channel/Console4Channel.xcodeproj/christopherjohnson.pbxuser
+++ b/plugins/MacVST/Console4Channel/Console4Channel.xcodeproj/christopherjohnson.pbxuser
@@ -49,13 +49,13 @@
 					PBXFileDataSource_Warnings_ColumnID,
 				);
 			};
-			PBXPerProjectTemplateStateSaveDate = 528459803;
-			PBXWorkspaceStateSaveDate = 528459803;
+			PBXPerProjectTemplateStateSaveDate = 569733860;
+			PBXWorkspaceStateSaveDate = 569733860;
 		};
 		perUserProjectItems = {
 			8B6F9BAB1D4A8F7100B449D5 /* PBXTextBookmark */ = 8B6F9BAB1D4A8F7100B449D5 /* PBXTextBookmark */;
 			8B6F9BAC1D4A8F7100B449D5 /* PBXTextBookmark */ = 8B6F9BAC1D4A8F7100B449D5 /* PBXTextBookmark */;
-			8B9D6AB31F7EDF7E007AB60F /* PBXTextBookmark */ = 8B9D6AB31F7EDF7E007AB60F /* PBXTextBookmark */;
+			8B79366D21F57303006E9731 /* PBXTextBookmark */ = 8B79366D21F57303006E9731 /* PBXTextBookmark */;
 			8B9D78D21F7FA82E007AB60F /* PBXTextBookmark */ = 8B9D78D21F7FA82E007AB60F /* PBXTextBookmark */;
 		};
 		sourceControlManager = 8B02375E1D42B1C400E1E8C8 /* Source Control */;
@@ -88,9 +88,9 @@
 	};
 	24D8286F09A914000093AEF8 /* Console4ChannelProc.cpp */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {677, 3445}}";
+			sepNavIntBoundsRect = "{{0, 0}, {733, 3146}}";
 			sepNavSelRange = "{3799, 0}";
-			sepNavVisRange = "{179, 112}";
+			sepNavVisRange = "{3549, 652}";
 			sepNavWindowFrame = "{{545, 47}, {895, 831}}";
 		};
 	};
@@ -128,15 +128,15 @@
 		vrLen = 150;
 		vrLoc = 2674;
 	};
-	8B9D6AB31F7EDF7E007AB60F /* PBXTextBookmark */ = {
+	8B79366D21F57303006E9731 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 24D8286F09A914000093AEF8 /* Console4ChannelProc.cpp */;
-		name = "Console4ChannelProc.cpp: 107";
+		name = "Console4ChannelProc.cpp: 106";
 		rLen = 0;
 		rLoc = 3799;
 		rType = 0;
-		vrLen = 174;
-		vrLoc = 117;
+		vrLen = 652;
+		vrLoc = 3549;
 	};
 	8B9D78D21F7FA82E007AB60F /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
diff --git a/plugins/MacVST/Console4Channel/Console4Channel.xcodeproj/christopherjohnson.perspectivev3 b/plugins/MacVST/Console4Channel/Console4Channel.xcodeproj/christopherjohnson.perspectivev3
index 351193c..8c6b190 100755
--- a/plugins/MacVST/Console4Channel/Console4Channel.xcodeproj/christopherjohnson.perspectivev3
+++ b/plugins/MacVST/Console4Channel/Console4Channel.xcodeproj/christopherjohnson.perspectivev3
@@ -351,12 +351,12 @@
 										<key>_historyCapacity</key>
 										<integer>0</integer>
 										<key>bookmark</key>
-										<string>8B9D78D21F7FA82E007AB60F</string>
+										<string>8B79366D21F57303006E9731</string>
 										<key>history</key>
 										<array>
 											<string>8B6F9BAB1D4A8F7100B449D5</string>
 											<string>8B6F9BAC1D4A8F7100B449D5</string>
-											<string>8B9D6AB31F7EDF7E007AB60F</string>
+											<string>8B9D78D21F7FA82E007AB60F</string>
 										</array>
 									</dict>
 									<key>SplitCount</key>
@@ -370,18 +370,18 @@
 							<key>GeometryConfiguration</key>
 							<dict>
 								<key>Frame</key>
-								<string>{{0, 0}, {603, 86}}</string>
+								<string>{{0, 0}, {603, 268}}</string>
 								<key>RubberWindowFrame</key>
 								<string>592 288 810 487 0 0 1440 878 </string>
 							</dict>
 							<key>Module</key>
 							<string>PBXNavigatorGroup</string>
 							<key>Proportion</key>
-							<string>86pt</string>
+							<string>268pt</string>
 						</dict>
 						<dict>
 							<key>Proportion</key>
-							<string>355pt</string>
+							<string>173pt</string>
 							<key>Tabs</key>
 							<array>
 								<dict>
@@ -395,7 +395,7 @@
 									<key>GeometryConfiguration</key>
 									<dict>
 										<key>Frame</key>
-										<string>{{10, 27}, {603, 328}}</string>
+										<string>{{10, 27}, {603, 146}}</string>
 										<key>RubberWindowFrame</key>
 										<string>592 288 810 487 0 0 1440 878 </string>
 									</dict>
@@ -479,11 +479,11 @@
 			</array>
 			<key>TableOfContents</key>
 			<array>
-				<string>8B9D78D31F7FA82E007AB60F</string>
+				<string>8B79366E21F57303006E9731</string>
 				<string>1CA23ED40692098700951B8B</string>
-				<string>8B9D78D41F7FA82E007AB60F</string>
+				<string>8B79366F21F57303006E9731</string>
 				<string>8B0237581D42B1C400E1E8C8</string>
-				<string>8B9D78D51F7FA82E007AB60F</string>
+				<string>8B79367021F57303006E9731</string>
 				<string>1CA23EDF0692099D00951B8B</string>
 				<string>1CA23EE00692099D00951B8B</string>
 				<string>1CA23EE10692099D00951B8B</string>
@@ -636,7 +636,7 @@
 	<key>StatusbarIsVisible</key>
 	<true/>
 	<key>TimeStamp</key>
-	<real>528459822.224684</real>
+	<real>569733891.37075198</real>
 	<key>ToolbarConfigUserDefaultsMinorVersion</key>
 	<string>2</string>
 	<key>ToolbarDisplayMode</key>
@@ -653,7 +653,6 @@
 	<integer>5</integer>
 	<key>WindowOrderList</key>
 	<array>
-		<string>8B9D78D61F7FA82E007AB60F</string>
 		<string>/Users/christopherjohnson/Desktop/MacVST/Console4Channel/Console4Channel.xcodeproj</string>
 	</array>
 	<key>WindowString</key>
diff --git a/plugins/MacVST/Console4Channel/source/Console4Channel.cpp b/plugins/MacVST/Console4Channel/source/Console4Channel.cpp
index 52f6190..2e524a1 100755
--- a/plugins/MacVST/Console4Channel/source/Console4Channel.cpp
+++ b/plugins/MacVST/Console4Channel/source/Console4Channel.cpp
@@ -20,11 +20,8 @@ Console4Channel::Console4Channel(audioMasterCallback audioMaster) :
 	gainchase = -90.0;
 	settingchase = -90.0;
 	chasespeed = 350.0;
-	fpNShapeLA = 0.0;
-	fpNShapeLB = 0.0;
-	fpNShapeRA = 0.0;
-	fpNShapeRB = 0.0;
-	fpFlip = true;
+	fpNShapeL = 0.0;
+	fpNShapeR = 0.0;
 
     // TODO: uncomment canDo entries according to your plugin's capabilities
 //    _canDo.insert("sendVstEvents"); // plug-in will send Vst events to Host.
diff --git a/plugins/MacVST/Console4Channel/source/Console4Channel.h b/plugins/MacVST/Console4Channel/source/Console4Channel.h
index 861ebe3..564853a 100755
--- a/plugins/MacVST/Console4Channel/source/Console4Channel.h
+++ b/plugins/MacVST/Console4Channel/source/Console4Channel.h
@@ -76,11 +76,8 @@ private:
 	double settingchase;
 	double chasespeed;
 
-	double fpNShapeLA;
-	double fpNShapeLB;
-	double fpNShapeRA;
-	double fpNShapeRB;
-	bool fpFlip;
+	double fpNShapeL;
+	double fpNShapeR;
 	//default stuff
 	float gain;
 };
diff --git a/plugins/MacVST/Console4Channel/source/Console4ChannelProc.cpp b/plugins/MacVST/Console4Channel/source/Console4ChannelProc.cpp
index 9bf7244..3538710 100755
--- a/plugins/MacVST/Console4Channel/source/Console4ChannelProc.cpp
+++ b/plugins/MacVST/Console4Channel/source/Console4ChannelProc.cpp
@@ -18,10 +18,6 @@ void Console4Channel::processReplacing(float **inputs, float **outputs, VstInt32
 	double overallscale = 1.0;
 	overallscale /= 44100.0;
 	overallscale *= getSampleRate();
-	float fpTemp;
-	double fpOld = 0.618033988749894848204586; //golden ratio!
-	double fpNew = 1.0 - fpOld;	
-
 	long double inputSampleL;
 	long double inputSampleR;
 	long double half;
@@ -105,25 +101,14 @@ void Console4Channel::processReplacing(float **inputs, float **outputs, VstInt32
 		//this is part of the Purest line: stuff that is on every track
 		//needs to be DAMN LOW ON MATH srsly guys
 		
-		//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;
@@ -145,9 +130,6 @@ void Console4Channel::processDoubleReplacing(double **inputs, double **outputs,
 	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;
@@ -232,25 +214,16 @@ void Console4Channel::processDoubleReplacing(double **inputs, double **outputs,
 		//this is part of the Purest line: stuff that is on every track
 		//needs to be DAMN LOW ON MATH srsly guys
 		
-		//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;