Floating Point Dither For All

5 files changed, 43 insertions, 75 deletions

diff --git a/plugins/MacVST/ToVinyl4/ToVinyl4.xcodeproj/christopherjohnson.pbxuser b/plugins/MacVST/ToVinyl4/ToVinyl4.xcodeproj/christopherjohnson.pbxuser
index 23a4119..7ffc1fc 100755
--- a/plugins/MacVST/ToVinyl4/ToVinyl4.xcodeproj/christopherjohnson.pbxuser
+++ b/plugins/MacVST/ToVinyl4/ToVinyl4.xcodeproj/christopherjohnson.pbxuser
@@ -49,12 +49,12 @@
 					PBXFileDataSource_Warnings_ColumnID,
 				);
 			};
-			PBXPerProjectTemplateStateSaveDate = 537055041;
-			PBXWorkspaceStateSaveDate = 537055041;
+			PBXPerProjectTemplateStateSaveDate = 569773266;
+			PBXWorkspaceStateSaveDate = 569773266;
 		};
 		perUserProjectItems = {
-			8B4D27EC2002CE340051360A /* PBXTextBookmark */ = 8B4D27EC2002CE340051360A /* PBXTextBookmark */;
 			8B7673412002CFD90068FDCE /* PBXTextBookmark */ = 8B7673412002CFD90068FDCE /* PBXTextBookmark */;
+			8B7941F021F60CDA006E9731 /* PBXTextBookmark */ = 8B7941F021F60CDA006E9731 /* PBXTextBookmark */;
 		};
 		sourceControlManager = 8B02375E1D42B1C400E1E8C8 /* Source Control */;
 		userBuildSettings = {
@@ -78,9 +78,9 @@
 	};
 	24A2FFDB0F90D1DD003BB5A7 /* audioeffectx.cpp */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {838, 19851}}";
+			sepNavIntBoundsRect = "{{0, 0}, {838, 19864}}";
 			sepNavSelRange = "{10616, 0}";
-			sepNavVisRange = "{10579, 157}";
+			sepNavVisRange = "{10613, 123}";
 			sepNavWindowFrame = "{{15, 42}, {895, 831}}";
 		};
 	};
@@ -106,25 +106,25 @@
 		isa = PBXCodeSenseManager;
 		indexTemplatePath = "";
 	};
-	8B4D27EC2002CE340051360A /* PBXTextBookmark */ = {
+	8B7673412002CFD90068FDCE /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 24A2FFDB0F90D1DD003BB5A7 /* audioeffectx.cpp */;
 		name = "audioeffectx.cpp: 307";
 		rLen = 0;
 		rLoc = 10616;
 		rType = 0;
-		vrLen = 280;
-		vrLoc = 10459;
+		vrLen = 157;
+		vrLoc = 10579;
 	};
-	8B7673412002CFD90068FDCE /* PBXTextBookmark */ = {
+	8B7941F021F60CDA006E9731 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 24A2FFDB0F90D1DD003BB5A7 /* audioeffectx.cpp */;
 		name = "audioeffectx.cpp: 307";
 		rLen = 0;
 		rLoc = 10616;
 		rType = 0;
-		vrLen = 157;
-		vrLoc = 10579;
+		vrLen = 123;
+		vrLoc = 10613;
 	};
 	8D01CCC60486CAD60068D4B7 /* ToVinyl4 */ = {
 		activeExec = 0;
diff --git a/plugins/MacVST/ToVinyl4/ToVinyl4.xcodeproj/christopherjohnson.perspectivev3 b/plugins/MacVST/ToVinyl4/ToVinyl4.xcodeproj/christopherjohnson.perspectivev3
index 09c35a6..19849f5 100755
--- a/plugins/MacVST/ToVinyl4/ToVinyl4.xcodeproj/christopherjohnson.perspectivev3
+++ b/plugins/MacVST/ToVinyl4/ToVinyl4.xcodeproj/christopherjohnson.perspectivev3
@@ -351,10 +351,10 @@
 										<key>_historyCapacity</key>
 										<integer>0</integer>
 										<key>bookmark</key>
-										<string>8B7673412002CFD90068FDCE</string>
+										<string>8B7941F021F60CDA006E9731</string>
 										<key>history</key>
 										<array>
-											<string>8B4D27EC2002CE340051360A</string>
+											<string>8B7673412002CFD90068FDCE</string>
 										</array>
 									</dict>
 									<key>SplitCount</key>
@@ -368,18 +368,18 @@
 							<key>GeometryConfiguration</key>
 							<dict>
 								<key>Frame</key>
-								<string>{{0, 0}, {603, 86}}</string>
+								<string>{{0, 0}, {603, 69}}</string>
 								<key>RubberWindowFrame</key>
 								<string>594 373 810 487 0 0 1440 878 </string>
 							</dict>
 							<key>Module</key>
 							<string>PBXNavigatorGroup</string>
 							<key>Proportion</key>
-							<string>86pt</string>
+							<string>69pt</string>
 						</dict>
 						<dict>
 							<key>Proportion</key>
-							<string>355pt</string>
+							<string>372pt</string>
 							<key>Tabs</key>
 							<array>
 								<dict>
@@ -393,7 +393,7 @@
 									<key>GeometryConfiguration</key>
 									<dict>
 										<key>Frame</key>
-										<string>{{10, 27}, {603, 328}}</string>
+										<string>{{10, 27}, {603, 345}}</string>
 										<key>RubberWindowFrame</key>
 										<string>594 373 810 487 0 0 1440 878 </string>
 									</dict>
@@ -477,11 +477,11 @@
 			</array>
 			<key>TableOfContents</key>
 			<array>
-				<string>8B7673422002CFD90068FDCE</string>
+				<string>8B7941F121F60CDA006E9731</string>
 				<string>1CA23ED40692098700951B8B</string>
-				<string>8B7673432002CFD90068FDCE</string>
+				<string>8B7941F221F60CDA006E9731</string>
 				<string>8B0237581D42B1C400E1E8C8</string>
-				<string>8B7673442002CFD90068FDCE</string>
+				<string>8B7941F321F60CDA006E9731</string>
 				<string>1CA23EDF0692099D00951B8B</string>
 				<string>1CA23EE00692099D00951B8B</string>
 				<string>1CA23EE10692099D00951B8B</string>
@@ -634,7 +634,7 @@
 	<key>StatusbarIsVisible</key>
 	<true/>
 	<key>TimeStamp</key>
-	<real>537055193.49498403</real>
+	<real>569773274.60291398</real>
 	<key>ToolbarConfigUserDefaultsMinorVersion</key>
 	<string>2</string>
 	<key>ToolbarDisplayMode</key>
diff --git a/plugins/MacVST/ToVinyl4/source/ToVinyl4.cpp b/plugins/MacVST/ToVinyl4/source/ToVinyl4.cpp
index b0c91f8..429187c 100755
--- a/plugins/MacVST/ToVinyl4/source/ToVinyl4.cpp
+++ b/plugins/MacVST/ToVinyl4/source/ToVinyl4.cpp
@@ -87,11 +87,8 @@ ToVinyl4::ToVinyl4(audioMasterCallback audioMaster) :
 	B = 0.3424051; //44.0 hz = ((B*B)*290)+10  (B*B)*290 = 34   (B*B) = 0.1172413  sqrt() = 0.3424051
 	C = 0.32;
 	D = 0.064;
-	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/ToVinyl4/source/ToVinyl4.h b/plugins/MacVST/ToVinyl4/source/ToVinyl4.h
index 57bffac..6a2dc26 100755
--- a/plugins/MacVST/ToVinyl4/source/ToVinyl4.h
+++ b/plugins/MacVST/ToVinyl4/source/ToVinyl4.h
@@ -142,11 +142,8 @@ private:
 	double bMidPrev;
 	double bSidePrev;
 	
-	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/ToVinyl4/source/ToVinyl4Proc.cpp b/plugins/MacVST/ToVinyl4/source/ToVinyl4Proc.cpp
index 8d9dc0c..a67af99 100755
--- a/plugins/MacVST/ToVinyl4/source/ToVinyl4Proc.cpp
+++ b/plugins/MacVST/ToVinyl4/source/ToVinyl4Proc.cpp
@@ -17,9 +17,6 @@ void ToVinyl4::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;	
 
 	double fusswithscale = 50000; //corrected
 	double cutofffreq = ((A*A)*290.0)+10.0;
@@ -464,25 +461,14 @@ void ToVinyl4::processReplacing(float **inputs, float **outputs, VstInt32 sample
 		inputSampleR = accumulatorSample;
 		//we just re-use accumulatorSample to do this little shuffle
 		
-		//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;
@@ -504,9 +490,6 @@ void ToVinyl4::processDoubleReplacing(double **inputs, double **outputs, VstInt3
 	double overallscale = 1.0;
 	overallscale /= 44100.0;
 	overallscale *= getSampleRate();
-	double fpTemp;
-	long double fpOld = 0.618033988749894848204586; //golden ratio!
-	long double fpNew = 1.0 - fpOld;	
 	
 	double fusswithscale = 50000; //corrected
 	double cutofffreq = ((A*A)*290.0)+10.0;
@@ -950,25 +933,16 @@ void ToVinyl4::processDoubleReplacing(double **inputs, double **outputs, VstInt3
 		inputSampleR = accumulatorSample;
 		//we just re-use accumulatorSample to do this little shuffle
 		
-		//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;