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 --- plugins/MacAU/EveryTrim/EveryTrim.cpp | 40 +++++------------ plugins/MacAU/EveryTrim/EveryTrim.h | 8 +--- .../EveryTrim.xcodeproj/christopherjohnson.pbxuser | 50 +++++++++++----------- .../christopherjohnson.perspectivev3 | 37 ++++++++-------- 4 files changed, 57 insertions(+), 78 deletions(-) (limited to 'plugins/MacAU/EveryTrim') diff --git a/plugins/MacAU/EveryTrim/EveryTrim.cpp b/plugins/MacAU/EveryTrim/EveryTrim.cpp index 94f854e..550a23a 100755 --- a/plugins/MacAU/EveryTrim/EveryTrim.cpp +++ b/plugins/MacAU/EveryTrim/EveryTrim.cpp @@ -203,11 +203,8 @@ ComponentResult EveryTrim::Initialize() // this is called the reset the DSP state (clear buffers, reset counters, etc.) ComponentResult EveryTrim::Reset(AudioUnitScope inScope, AudioUnitElement inElement) { - fpNShapeLA = 0.0; - fpNShapeLB = 0.0; - fpNShapeRA = 0.0; - fpNShapeRB = 0.0; - fpFlip = true; + fpNShapeL = 0.0; + fpNShapeR = 0.0; return noErr; } @@ -226,11 +223,7 @@ OSStatus EveryTrim::ProcessBufferLists(AudioUnitRenderActionFlags & ioActionFla Float32 * outputL = (Float32*)(outBuffer.mBuffers[0].mData); Float32 * outputR = (Float32*)(outBuffer.mBuffers[1].mData); UInt32 nSampleFrames = inFramesToProcess; - - Float32 fpTemp; - long double fpOld = 0.618033988749894848204586; //golden ratio! - long double fpNew = 1.0 - fpOld; - + long double inputSampleL; long double inputSampleR; long double mid; @@ -296,25 +289,14 @@ OSStatus EveryTrim::ProcessBufferLists(AudioUnitRenderActionFlags & ioActionFla inputSampleR = (mid-side) * rightgain; //contains mastergain and the gain trim fixing the mid/side - //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((Float32)inputSampleL, &expon); + long double dither = (rand()/(RAND_MAX*7.737125245533627e+25))*pow(2,expon+62); + inputSampleL += (dither-fpNShapeL); fpNShapeL = dither; + frexpf((Float32)inputSampleR, &expon); + dither = (rand()/(RAND_MAX*7.737125245533627e+25))*pow(2,expon+62); + inputSampleR += (dither-fpNShapeR); fpNShapeR = dither; + //end 32 bit dither *outputL = inputSampleL; *outputR = inputSampleR; diff --git a/plugins/MacAU/EveryTrim/EveryTrim.h b/plugins/MacAU/EveryTrim/EveryTrim.h index dfb8b69..58ffc72 100755 --- a/plugins/MacAU/EveryTrim/EveryTrim.h +++ b/plugins/MacAU/EveryTrim/EveryTrim.h @@ -121,12 +121,8 @@ public: virtual ComponentResult Version() { return kEveryTrimVersion; } private: - long double fpNShapeLA; - long double fpNShapeLB; - long double fpNShapeRA; - long double fpNShapeRB; - bool fpFlip; - //default stuff + long double fpNShapeL; + long double fpNShapeR; }; diff --git a/plugins/MacAU/EveryTrim/EveryTrim.xcodeproj/christopherjohnson.pbxuser b/plugins/MacAU/EveryTrim/EveryTrim.xcodeproj/christopherjohnson.pbxuser index 9bc4e8a..bd0016f 100755 --- a/plugins/MacAU/EveryTrim/EveryTrim.xcodeproj/christopherjohnson.pbxuser +++ b/plugins/MacAU/EveryTrim/EveryTrim.xcodeproj/christopherjohnson.pbxuser @@ -49,32 +49,42 @@ PBXFileDataSource_Warnings_ColumnID, ); }; - PBXPerProjectTemplateStateSaveDate = 557257719; - PBXWorkspaceStateSaveDate = 557257719; + PBXPerProjectTemplateStateSaveDate = 569644212; + PBXWorkspaceStateSaveDate = 569644212; }; perUserProjectItems = { - 8B67C6D91FA1721B008C64D6 /* PBXTextBookmark */ = 8B67C6D91FA1721B008C64D6 /* PBXTextBookmark */; - 8BFDAF84213714150079F90D /* PBXTextBookmark */ = 8BFDAF84213714150079F90D /* PBXTextBookmark */; + 8B792C1021F4152A006E9731 /* PBXTextBookmark */ = 8B792C1021F4152A006E9731 /* PBXTextBookmark */; + 8B792C1621F41559006E9731 /* PBXTextBookmark */ = 8B792C1621F41559006E9731 /* PBXTextBookmark */; }; sourceControlManager = 8BD3CCB8148830B20062E48C /* Source Control */; userBuildSettings = { }; }; - 8B67C6D91FA1721B008C64D6 /* PBXTextBookmark */ = { + 8B792C1021F4152A006E9731 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 8BA05A660720730100365D66 /* EveryTrim.cpp */; - name = "EveryTrim.cpp: 208"; + name = "EveryTrim.cpp: 207"; rLen = 0; - rLoc = 9439; + rLoc = 9418; rType = 0; - vrLen = 105; - vrLoc = 29; + vrLen = 69; + vrLoc = 65; + }; + 8B792C1621F41559006E9731 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8BA05A660720730100365D66 /* EveryTrim.cpp */; + name = "EveryTrim.cpp: 207"; + rLen = 0; + rLoc = 9418; + rType = 0; + vrLen = 69; + vrLoc = 65; }; 8BA05A660720730100365D66 /* EveryTrim.cpp */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {803, 4407}}"; - sepNavSelRange = "{9439, 0}"; - sepNavVisRange = "{44, 90}"; + sepNavIntBoundsRect = "{{0, 0}, {803, 4238}}"; + sepNavSelRange = "{9418, 0}"; + sepNavVisRange = "{65, 69}"; sepNavWindowFrame = "{{170, 67}, {1070, 811}}"; }; }; @@ -96,9 +106,9 @@ }; 8BC6025B073B072D006C4272 /* EveryTrim.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1023, 1768}}"; - sepNavSelRange = "{5173, 131}"; - sepNavVisRange = "{3570, 1835}"; + sepNavIntBoundsRect = "{{0, 0}, {1023, 1716}}"; + sepNavSelRange = "{5221, 0}"; + sepNavVisRange = "{3522, 1806}"; sepNavWindowFrame = "{{370, 67}, {1070, 811}}"; }; }; @@ -116,16 +126,6 @@ isa = PBXCodeSenseManager; indexTemplatePath = ""; }; - 8BFDAF84213714150079F90D /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8BA05A660720730100365D66 /* EveryTrim.cpp */; - name = "EveryTrim.cpp: 208"; - rLen = 0; - rLoc = 9439; - rType = 0; - vrLen = 90; - vrLoc = 44; - }; 8D01CCC60486CAD60068D4B7 /* EveryTrim */ = { activeExec = 0; }; diff --git a/plugins/MacAU/EveryTrim/EveryTrim.xcodeproj/christopherjohnson.perspectivev3 b/plugins/MacAU/EveryTrim/EveryTrim.xcodeproj/christopherjohnson.perspectivev3 index 3937f74..afd4e1f 100755 --- a/plugins/MacAU/EveryTrim/EveryTrim.xcodeproj/christopherjohnson.perspectivev3 +++ b/plugins/MacAU/EveryTrim/EveryTrim.xcodeproj/christopherjohnson.perspectivev3 @@ -225,8 +225,8 @@ PerspectiveWidths - -1 - -1 + 810 + 810 Perspectives @@ -325,7 +325,7 @@ 185 RubberWindowFrame - 610 324 810 487 0 0 1440 878 + 507 328 810 487 0 0 1440 878 Module PBXSmartGroupTreeModule @@ -353,10 +353,10 @@ _historyCapacity 0 bookmark - 8BFDAF84213714150079F90D + 8B792C1621F41559006E9731 history - 8B67C6D91FA1721B008C64D6 + 8B792C1021F4152A006E9731 SplitCount @@ -370,18 +370,18 @@ GeometryConfiguration Frame - {{0, 0}, {603, 86}} + {{0, 0}, {603, 69}} RubberWindowFrame - 610 324 810 487 0 0 1440 878 + 507 328 810 487 0 0 1440 878 Module PBXNavigatorGroup Proportion - 86pt + 69pt Proportion - 355pt + 372pt Tabs @@ -395,9 +395,7 @@ GeometryConfiguration Frame - {{10, 27}, {603, 328}} - RubberWindowFrame - 610 324 810 487 0 0 1440 878 + {{10, 27}, {603, 345}} Module XCDetailModule @@ -451,7 +449,9 @@ GeometryConfiguration Frame - {{10, 31}, {603, 297}} + {{10, 27}, {603, 345}} + RubberWindowFrame + 507 328 810 487 0 0 1440 878 Module PBXBuildResultsModule @@ -479,11 +479,11 @@ TableOfContents - 8BFDAF85213714150079F90D + 8B792C1721F41559006E9731 1CA23ED40692098700951B8B - 8BFDAF86213714150079F90D + 8B792C1821F41559006E9731 8B753E6F1E40231800347157 - 8BFDAF87213714150079F90D + 8B792C1921F41559006E9731 1CA23EDF0692099D00951B8B 1CA23EE00692099D00951B8B 1CA23EE10692099D00951B8B @@ -636,7 +636,7 @@ StatusbarIsVisible TimeStamp - 557257749.03621697 + 569644377.55946004 ToolbarConfigUserDefaultsMinorVersion 2 ToolbarDisplayMode @@ -653,10 +653,11 @@ 5 WindowOrderList + 8B792C1A21F41559006E9731 /Users/christopherjohnson/Desktop/MacAU/EveryTrim/EveryTrim.xcodeproj WindowString - 610 324 810 487 0 0 1440 878 + 507 328 810 487 0 0 1440 878 WindowToolsV3 -- cgit v1.2.3