Floating Point Dither For All

5 files changed, 41 insertions, 75 deletions

diff --git a/plugins/MacVST/Console4Buss/Console4Buss.xcodeproj/christopherjohnson.pbxuser b/plugins/MacVST/Console4Buss/Console4Buss.xcodeproj/christopherjohnson.pbxuser
index 6a04444..131d5b2 100755
--- a/plugins/MacVST/Console4Buss/Console4Buss.xcodeproj/christopherjohnson.pbxuser
+++ b/plugins/MacVST/Console4Buss/Console4Buss.xcodeproj/christopherjohnson.pbxuser
@@ -49,11 +49,11 @@
 					PBXFileDataSource_Warnings_ColumnID,
 				);
 			};
-			PBXPerProjectTemplateStateSaveDate = 528459773;
-			PBXWorkspaceStateSaveDate = 528459773;
+			PBXPerProjectTemplateStateSaveDate = 569733814;
+			PBXWorkspaceStateSaveDate = 569733814;
 		};
 		perUserProjectItems = {
-			8B9D6A9F1F7EDF5C007AB60F /* PBXTextBookmark */ = 8B9D6A9F1F7EDF5C007AB60F /* PBXTextBookmark */;
+			8B79364B21F572C9006E9731 /* PBXTextBookmark */ = 8B79364B21F572C9006E9731 /* PBXTextBookmark */;
 			8B9D78B21F7FA812007AB60F /* PBXTextBookmark */ = 8B9D78B21F7FA812007AB60F /* PBXTextBookmark */;
 			8BB1EB551F76F0C500413848 /* PBXTextBookmark */ = 8BB1EB551F76F0C500413848 /* PBXTextBookmark */;
 		};
@@ -87,9 +87,9 @@
 	};
 	24D8286F09A914000093AEF8 /* Console4BussProc.cpp */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {712, 4043}}";
+			sepNavIntBoundsRect = "{{0, 0}, {712, 3562}}";
 			sepNavSelRange = "{5847, 0}";
-			sepNavVisRange = "{5332, 516}";
+			sepNavVisRange = "{5384, 639}";
 			sepNavWindowFrame = "{{531, 47}, {895, 831}}";
 		};
 	};
@@ -107,15 +107,15 @@
 		isa = PBXCodeSenseManager;
 		indexTemplatePath = "";
 	};
-	8B9D6A9F1F7EDF5C007AB60F /* PBXTextBookmark */ = {
+	8B79364B21F572C9006E9731 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 24D8286F09A914000093AEF8 /* Console4BussProc.cpp */;
-		name = "Console4BussProc.cpp: 169";
+		name = "Console4BussProc.cpp: 171";
 		rLen = 0;
 		rLoc = 5847;
 		rType = 0;
-		vrLen = 526;
-		vrLoc = 5322;
+		vrLen = 639;
+		vrLoc = 5384;
 	};
 	8B9D78B21F7FA812007AB60F /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
diff --git a/plugins/MacVST/Console4Buss/Console4Buss.xcodeproj/christopherjohnson.perspectivev3 b/plugins/MacVST/Console4Buss/Console4Buss.xcodeproj/christopherjohnson.perspectivev3
index 50d91cf..ab709b7 100755
--- a/plugins/MacVST/Console4Buss/Console4Buss.xcodeproj/christopherjohnson.perspectivev3
+++ b/plugins/MacVST/Console4Buss/Console4Buss.xcodeproj/christopherjohnson.perspectivev3
@@ -351,11 +351,11 @@
 										<key>_historyCapacity</key>
 										<integer>0</integer>
 										<key>bookmark</key>
-										<string>8B9D78B21F7FA812007AB60F</string>
+										<string>8B79364B21F572C9006E9731</string>
 										<key>history</key>
 										<array>
 											<string>8BB1EB551F76F0C500413848</string>
-											<string>8B9D6A9F1F7EDF5C007AB60F</string>
+											<string>8B9D78B21F7FA812007AB60F</string>
 										</array>
 									</dict>
 									<key>SplitCount</key>
@@ -369,18 +369,18 @@
 							<key>GeometryConfiguration</key>
 							<dict>
 								<key>Frame</key>
-								<string>{{0, 0}, {603, 292}}</string>
+								<string>{{0, 0}, {603, 285}}</string>
 								<key>RubberWindowFrame</key>
 								<string>585 260 810 487 0 0 1440 878 </string>
 							</dict>
 							<key>Module</key>
 							<string>PBXNavigatorGroup</string>
 							<key>Proportion</key>
-							<string>292pt</string>
+							<string>285pt</string>
 						</dict>
 						<dict>
 							<key>Proportion</key>
-							<string>149pt</string>
+							<string>156pt</string>
 							<key>Tabs</key>
 							<array>
 								<dict>
@@ -394,7 +394,7 @@
 									<key>GeometryConfiguration</key>
 									<dict>
 										<key>Frame</key>
-										<string>{{10, 27}, {603, 122}}</string>
+										<string>{{10, 27}, {603, 129}}</string>
 										<key>RubberWindowFrame</key>
 										<string>585 260 810 487 0 0 1440 878 </string>
 									</dict>
@@ -478,11 +478,11 @@
 			</array>
 			<key>TableOfContents</key>
 			<array>
-				<string>8B9D78B31F7FA812007AB60F</string>
+				<string>8B79364C21F572C9006E9731</string>
 				<string>1CA23ED40692098700951B8B</string>
-				<string>8B9D78B41F7FA812007AB60F</string>
+				<string>8B79364D21F572C9006E9731</string>
 				<string>8B0237581D42B1C400E1E8C8</string>
-				<string>8B9D78B51F7FA812007AB60F</string>
+				<string>8B79364E21F572C9006E9731</string>
 				<string>1CA23EDF0692099D00951B8B</string>
 				<string>1CA23EE00692099D00951B8B</string>
 				<string>1CA23EE10692099D00951B8B</string>
@@ -635,7 +635,7 @@
 	<key>StatusbarIsVisible</key>
 	<true/>
 	<key>TimeStamp</key>
-	<real>528459794.51351899</real>
+	<real>569733833.14621103</real>
 	<key>ToolbarConfigUserDefaultsMinorVersion</key>
 	<string>2</string>
 	<key>ToolbarDisplayMode</key>
@@ -652,7 +652,6 @@
 	<integer>5</integer>
 	<key>WindowOrderList</key>
 	<array>
-		<string>8B9D78B61F7FA812007AB60F</string>
 		<string>/Users/christopherjohnson/Desktop/MacVST/Console4Buss/Console4Buss.xcodeproj</string>
 	</array>
 	<key>WindowString</key>
diff --git a/plugins/MacVST/Console4Buss/source/Console4Buss.cpp b/plugins/MacVST/Console4Buss/source/Console4Buss.cpp
index 79c7f6f..0c8e00c 100755
--- a/plugins/MacVST/Console4Buss/source/Console4Buss.cpp
+++ b/plugins/MacVST/Console4Buss/source/Console4Buss.cpp
@@ -22,11 +22,8 @@ Console4Buss::Console4Buss(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/Console4Buss/source/Console4Buss.h b/plugins/MacVST/Console4Buss/source/Console4Buss.h
index b19e6f2..9a9cbfb 100755
--- a/plugins/MacVST/Console4Buss/source/Console4Buss.h
+++ b/plugins/MacVST/Console4Buss/source/Console4Buss.h
@@ -71,11 +71,8 @@ private:
     char _programName[kVstMaxProgNameLen + 1];
     std::set< std::string > _canDo;
     
-	double fpNShapeLA;
-	double fpNShapeLB;
-	double fpNShapeRA;
-	double fpNShapeRB;
-	bool fpFlip;
+	double fpNShapeL;
+	double fpNShapeR;
 	//default stuff
 	double lastSampleL;
 	double lastSampleR;
diff --git a/plugins/MacVST/Console4Buss/source/Console4BussProc.cpp b/plugins/MacVST/Console4Buss/source/Console4BussProc.cpp
index 712e496..dde872a 100755
--- a/plugins/MacVST/Console4Buss/source/Console4BussProc.cpp
+++ b/plugins/MacVST/Console4Buss/source/Console4BussProc.cpp
@@ -18,10 +18,6 @@ void Console4Buss::processReplacing(float **inputs, float **outputs, VstInt32 sa
 	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;
@@ -123,25 +119,14 @@ void Console4Buss::processReplacing(float **inputs, float **outputs, VstInt32 sa
 		//this is the inverse processing for Console: boosts but not so much if there's slew.
 		//is this too subtle an effect?
 		
-		//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;
@@ -163,9 +148,6 @@ void Console4Buss::processDoubleReplacing(double **inputs, double **outputs, Vst
 	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;    
@@ -267,25 +249,16 @@ void Console4Buss::processDoubleReplacing(double **inputs, double **outputs, Vst
 		//this is the inverse processing for Console: boosts but not so much if there's slew.
 		//is this too subtle an effect?
 
-		//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;