From 966f2d253cd2ee6ce140ad68095a20a9d2b63052 Mon Sep 17 00:00:00 2001 From: Chris Johnson Date: Sun, 27 Jan 2019 21:13:54 -0500 Subject: Floating Point Dither For All --- .../christopherjohnson.pbxuser | 8 +-- .../christopherjohnson.perspectivev3 | 10 ++-- .../VoiceOfTheStarship.xcodeproj/project.pbxproj | 4 +- .../project.xcworkspace/contents.xcworkspacedata | 0 .../UserInterfaceState.xcuserstate | Bin .../UserInterfaceState.xcuserstate | Bin .../VoiceOfTheStarship.xcodeproj/spiadmin.mode1v3 | 0 .../VoiceOfTheStarship.xcodeproj/spiadmin.pbxuser | 0 .../xcschemes/Gain.xcscheme | 0 .../xcschemes/xcschememanagement.plist | 0 .../xcschemes/xcschememanagement.plist | 0 .../\302\253PROJECTNAME\302\273.xcscheme" | 0 .../source/VoiceOfTheStarship.cpp | 7 +-- .../VoiceOfTheStarship/source/VoiceOfTheStarship.h | 7 +-- .../source/VoiceOfTheStarshipProc.cpp | 62 ++++++--------------- 15 files changed, 33 insertions(+), 65 deletions(-) mode change 100644 => 100755 plugins/MacVST/VoiceOfTheStarship/VoiceOfTheStarship.xcodeproj/christopherjohnson.pbxuser mode change 100644 => 100755 plugins/MacVST/VoiceOfTheStarship/VoiceOfTheStarship.xcodeproj/christopherjohnson.perspectivev3 mode change 100644 => 100755 plugins/MacVST/VoiceOfTheStarship/VoiceOfTheStarship.xcodeproj/project.xcworkspace/contents.xcworkspacedata mode change 100644 => 100755 plugins/MacVST/VoiceOfTheStarship/VoiceOfTheStarship.xcodeproj/project.xcworkspace/xcuserdata/christopherjohnson.xcuserdatad/UserInterfaceState.xcuserstate mode change 100644 => 100755 plugins/MacVST/VoiceOfTheStarship/VoiceOfTheStarship.xcodeproj/project.xcworkspace/xcuserdata/spiadmin.xcuserdatad/UserInterfaceState.xcuserstate mode change 100644 => 100755 plugins/MacVST/VoiceOfTheStarship/VoiceOfTheStarship.xcodeproj/spiadmin.mode1v3 mode change 100644 => 100755 plugins/MacVST/VoiceOfTheStarship/VoiceOfTheStarship.xcodeproj/spiadmin.pbxuser mode change 100644 => 100755 plugins/MacVST/VoiceOfTheStarship/VoiceOfTheStarship.xcodeproj/xcuserdata/christopherjohnson.xcuserdatad/xcschemes/Gain.xcscheme mode change 100644 => 100755 plugins/MacVST/VoiceOfTheStarship/VoiceOfTheStarship.xcodeproj/xcuserdata/christopherjohnson.xcuserdatad/xcschemes/xcschememanagement.plist mode change 100644 => 100755 plugins/MacVST/VoiceOfTheStarship/VoiceOfTheStarship.xcodeproj/xcuserdata/spiadmin.xcuserdatad/xcschemes/xcschememanagement.plist mode change 100644 => 100755 "plugins/MacVST/VoiceOfTheStarship/VoiceOfTheStarship.xcodeproj/xcuserdata/spiadmin.xcuserdatad/xcschemes/\302\253PROJECTNAME\302\273.xcscheme" (limited to 'plugins/MacVST/VoiceOfTheStarship') diff --git a/plugins/MacVST/VoiceOfTheStarship/VoiceOfTheStarship.xcodeproj/christopherjohnson.pbxuser b/plugins/MacVST/VoiceOfTheStarship/VoiceOfTheStarship.xcodeproj/christopherjohnson.pbxuser old mode 100644 new mode 100755 index cc6b613..2be57bf --- a/plugins/MacVST/VoiceOfTheStarship/VoiceOfTheStarship.xcodeproj/christopherjohnson.pbxuser +++ b/plugins/MacVST/VoiceOfTheStarship/VoiceOfTheStarship.xcodeproj/christopherjohnson.pbxuser @@ -2,7 +2,7 @@ { 089C1669FE841209C02AAC07 /* Project object */ = { activeBuildConfigurationName = Release; - activeTarget = 8D01CCC60486CAD60068D4B7 /* VoiceOfTheStarship */; + activeTarget = 8D01CCC60486CAD60068D4B7 /* AudioUnit */; codeSenseManager = 8B02375F1D42B1C400E1E8C8 /* Code sense */; perUserDictionary = { PBXConfiguration.PBXFileTableDataSource3.PBXFileTableDataSource = { @@ -49,8 +49,8 @@ PBXFileDataSource_Warnings_ColumnID, ); }; - PBXPerProjectTemplateStateSaveDate = 538706768; - PBXWorkspaceStateSaveDate = 538706768; + PBXPerProjectTemplateStateSaveDate = 569773528; + PBXWorkspaceStateSaveDate = 569773528; }; sourceControlManager = 8B02375E1D42B1C400E1E8C8 /* Source Control */; userBuildSettings = { @@ -102,7 +102,7 @@ isa = PBXCodeSenseManager; indexTemplatePath = ""; }; - 8D01CCC60486CAD60068D4B7 /* VoiceOfTheStarship */ = { + 8D01CCC60486CAD60068D4B7 /* AudioUnit */ = { activeExec = 0; }; } diff --git a/plugins/MacVST/VoiceOfTheStarship/VoiceOfTheStarship.xcodeproj/christopherjohnson.perspectivev3 b/plugins/MacVST/VoiceOfTheStarship/VoiceOfTheStarship.xcodeproj/christopherjohnson.perspectivev3 old mode 100644 new mode 100755 index 2952204..91123cf --- a/plugins/MacVST/VoiceOfTheStarship/VoiceOfTheStarship.xcodeproj/christopherjohnson.perspectivev3 +++ b/plugins/MacVST/VoiceOfTheStarship/VoiceOfTheStarship.xcodeproj/christopherjohnson.perspectivev3 @@ -469,11 +469,11 @@ TableOfContents - 8B4E5825201C035700B5DC2A + 8B7942EC21F60DE2006E9731 1CA23ED40692098700951B8B - 8B4E5826201C035700B5DC2A + 8B7942ED21F60DE2006E9731 8B0237581D42B1C400E1E8C8 - 8B4E5827201C035700B5DC2A + 8B7942EE21F60DE2006E9731 1CA23EDF0692099D00951B8B 1CA23EE00692099D00951B8B 1CA23EE10692099D00951B8B @@ -626,7 +626,7 @@ StatusbarIsVisible TimeStamp - 538709213.91348803 + 569773538.74268901 ToolbarConfigUserDefaultsMinorVersion 2 ToolbarDisplayMode @@ -643,7 +643,7 @@ 5 WindowOrderList - /Users/christopherjohnson/Desktop/VoiceOfTheStarship/VoiceOfTheStarship.xcodeproj + /Users/christopherjohnson/Desktop/MacVST/VoiceOfTheStarship/VoiceOfTheStarship.xcodeproj WindowString 123 420 688 434 0 0 1440 878 diff --git a/plugins/MacVST/VoiceOfTheStarship/VoiceOfTheStarship.xcodeproj/project.pbxproj b/plugins/MacVST/VoiceOfTheStarship/VoiceOfTheStarship.xcodeproj/project.pbxproj index 6a80a71..1ae3b0f 100755 --- a/plugins/MacVST/VoiceOfTheStarship/VoiceOfTheStarship.xcodeproj/project.pbxproj +++ b/plugins/MacVST/VoiceOfTheStarship/VoiceOfTheStarship.xcodeproj/project.pbxproj @@ -1894,7 +1894,7 @@ /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ - 8D01CCC60486CAD60068D4B7 /* VoiceOfTheStarship */ = { + 8D01CCC60486CAD60068D4B7 /* AudioUnit */ = { isa = PBXNativeTarget; buildConfigurationList = 24BEAAED08919AE700E695F9 /* Build configuration list for PBXNativeTarget "VoiceOfTheStarship" */; buildPhases = ( @@ -1947,7 +1947,7 @@ ); projectRoot = ""; targets = ( - 8D01CCC60486CAD60068D4B7 /* VoiceOfTheStarship */, + 8D01CCC60486CAD60068D4B7 /* AudioUnit */, ); }; /* End PBXProject section */ diff --git a/plugins/MacVST/VoiceOfTheStarship/VoiceOfTheStarship.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/plugins/MacVST/VoiceOfTheStarship/VoiceOfTheStarship.xcodeproj/project.xcworkspace/contents.xcworkspacedata old mode 100644 new mode 100755 diff --git a/plugins/MacVST/VoiceOfTheStarship/VoiceOfTheStarship.xcodeproj/project.xcworkspace/xcuserdata/christopherjohnson.xcuserdatad/UserInterfaceState.xcuserstate b/plugins/MacVST/VoiceOfTheStarship/VoiceOfTheStarship.xcodeproj/project.xcworkspace/xcuserdata/christopherjohnson.xcuserdatad/UserInterfaceState.xcuserstate old mode 100644 new mode 100755 diff --git a/plugins/MacVST/VoiceOfTheStarship/VoiceOfTheStarship.xcodeproj/project.xcworkspace/xcuserdata/spiadmin.xcuserdatad/UserInterfaceState.xcuserstate b/plugins/MacVST/VoiceOfTheStarship/VoiceOfTheStarship.xcodeproj/project.xcworkspace/xcuserdata/spiadmin.xcuserdatad/UserInterfaceState.xcuserstate old mode 100644 new mode 100755 diff --git a/plugins/MacVST/VoiceOfTheStarship/VoiceOfTheStarship.xcodeproj/spiadmin.mode1v3 b/plugins/MacVST/VoiceOfTheStarship/VoiceOfTheStarship.xcodeproj/spiadmin.mode1v3 old mode 100644 new mode 100755 diff --git a/plugins/MacVST/VoiceOfTheStarship/VoiceOfTheStarship.xcodeproj/spiadmin.pbxuser b/plugins/MacVST/VoiceOfTheStarship/VoiceOfTheStarship.xcodeproj/spiadmin.pbxuser old mode 100644 new mode 100755 diff --git a/plugins/MacVST/VoiceOfTheStarship/VoiceOfTheStarship.xcodeproj/xcuserdata/christopherjohnson.xcuserdatad/xcschemes/Gain.xcscheme b/plugins/MacVST/VoiceOfTheStarship/VoiceOfTheStarship.xcodeproj/xcuserdata/christopherjohnson.xcuserdatad/xcschemes/Gain.xcscheme old mode 100644 new mode 100755 diff --git a/plugins/MacVST/VoiceOfTheStarship/VoiceOfTheStarship.xcodeproj/xcuserdata/christopherjohnson.xcuserdatad/xcschemes/xcschememanagement.plist b/plugins/MacVST/VoiceOfTheStarship/VoiceOfTheStarship.xcodeproj/xcuserdata/christopherjohnson.xcuserdatad/xcschemes/xcschememanagement.plist old mode 100644 new mode 100755 diff --git a/plugins/MacVST/VoiceOfTheStarship/VoiceOfTheStarship.xcodeproj/xcuserdata/spiadmin.xcuserdatad/xcschemes/xcschememanagement.plist b/plugins/MacVST/VoiceOfTheStarship/VoiceOfTheStarship.xcodeproj/xcuserdata/spiadmin.xcuserdatad/xcschemes/xcschememanagement.plist old mode 100644 new mode 100755 diff --git "a/plugins/MacVST/VoiceOfTheStarship/VoiceOfTheStarship.xcodeproj/xcuserdata/spiadmin.xcuserdatad/xcschemes/\302\253PROJECTNAME\302\273.xcscheme" "b/plugins/MacVST/VoiceOfTheStarship/VoiceOfTheStarship.xcodeproj/xcuserdata/spiadmin.xcuserdatad/xcschemes/\302\253PROJECTNAME\302\273.xcscheme" old mode 100644 new mode 100755 diff --git a/plugins/MacVST/VoiceOfTheStarship/source/VoiceOfTheStarship.cpp b/plugins/MacVST/VoiceOfTheStarship/source/VoiceOfTheStarship.cpp index c30bd47..19f1d94 100755 --- a/plugins/MacVST/VoiceOfTheStarship/source/VoiceOfTheStarship.cpp +++ b/plugins/MacVST/VoiceOfTheStarship/source/VoiceOfTheStarship.cpp @@ -28,11 +28,8 @@ VoiceOfTheStarship::VoiceOfTheStarship(audioMasterCallback audioMaster) : for(int count = 0; count < 11; count++) {bL[count] = 0.0; bR[count] = 0.0; f[count] = 0.0;} lastAlgorithm = 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/VoiceOfTheStarship/source/VoiceOfTheStarship.h b/plugins/MacVST/VoiceOfTheStarship/source/VoiceOfTheStarship.h index febb344..519923b 100755 --- a/plugins/MacVST/VoiceOfTheStarship/source/VoiceOfTheStarship.h +++ b/plugins/MacVST/VoiceOfTheStarship/source/VoiceOfTheStarship.h @@ -73,11 +73,8 @@ private: int lastAlgorithm; - 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/VoiceOfTheStarship/source/VoiceOfTheStarshipProc.cpp b/plugins/MacVST/VoiceOfTheStarship/source/VoiceOfTheStarshipProc.cpp index 32979d0..bbb14fa 100755 --- a/plugins/MacVST/VoiceOfTheStarship/source/VoiceOfTheStarshipProc.cpp +++ b/plugins/MacVST/VoiceOfTheStarship/source/VoiceOfTheStarshipProc.cpp @@ -79,9 +79,6 @@ void VoiceOfTheStarship::processReplacing(float **inputs, float **outputs, VstIn double inputSampleL; double inputSampleR; - float fpTemp; - double fpOld = 0.618033988749894848204586; //golden ratio! - double fpNew = 1.0 - fpOld; while (--sampleFrames >= 0) { @@ -181,25 +178,14 @@ void VoiceOfTheStarship::processReplacing(float **inputs, float **outputs, VstIn filterflip = !filterflip; - //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; @@ -283,9 +269,6 @@ void VoiceOfTheStarship::processDoubleReplacing(double **inputs, double **output double inputSampleL; double inputSampleR; - double fpTemp; - long double fpOld = 0.618033988749894848204586; //golden ratio! - long double fpNew = 1.0 - fpOld; while (--sampleFrames >= 0) { @@ -384,25 +367,16 @@ void VoiceOfTheStarship::processDoubleReplacing(double **inputs, double **output flipR = !flipR; filterflip = !filterflip; - //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; -- cgit v1.2.3