Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

TruePeak Interpolator: Ensure enough storage #284

Merged
merged 1 commit into from
Oct 31, 2024
Merged

TruePeak Interpolator: Ensure enough storage #284

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 13 additions & 8 deletions include/algorithms/util/TruePeak.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,12 @@ class Interpolator
};

public:
Interpolator(index maxtaps, index maxfactor, Allocator& alloc)
: mMaxTaps{maxtaps}, mMaxFactor{maxfactor},
mMaxLatency{(mMaxTaps + mMaxFactor - 1) / mMaxFactor},
mBuffer(asUnsigned(mMaxLatency), alloc), mCount(asUnsigned(mMaxFactor), alloc),
Interpolator(index maxtaps, index maxfactor, index minFactor,
Allocator& alloc)
: mMaxTaps{maxtaps}, mMaxFactor{maxfactor}, mMinFactor{minFactor},
mMaxLatency{(mMaxTaps + mMinFactor - 1) / minFactor},
mBuffer(asUnsigned(mMaxLatency), alloc),
mCount(asUnsigned(mMaxFactor), alloc),
mFilters(mMaxFactor, mMaxLatency, alloc),
mIndex(mMaxFactor, mMaxLatency, alloc)
{}
Expand All @@ -47,6 +49,7 @@ class Interpolator
{
assert(taps <= mMaxTaps);
assert(factor <= mMaxFactor);
assert(factor >= mMinFactor);
assert(factor > 0);
assert(taps > 0);

Expand Down Expand Up @@ -121,7 +124,8 @@ class Interpolator

index mMaxTaps;
index mMaxFactor;
index mMaxLatency;
index mMinFactor;
index mMaxLatency;

index mTaps;
index mFactor;
Expand All @@ -142,17 +146,18 @@ class TruePeak
{
static constexpr index nTaps = 49;
static constexpr index maxFactor = 4;
static constexpr index minFactor = 2;

public:
TruePeak(index maxSize, Allocator& alloc)
: mInterpolator(nTaps, maxFactor, alloc), mBuffer{maxFactor * maxSize,
alloc}
: mInterpolator(nTaps, maxFactor, minFactor, alloc),
mBuffer{maxFactor * maxSize, alloc}
{}

void init(index /*size*/, double sampleRate, Allocator&)
{
mSampleRate = sampleRate;
mFactor = sampleRate < (2 * 44100) ? 4 : 2;
mFactor = sampleRate < (2 * 44100) ? maxFactor : minFactor;
mInterpolator.init(nTaps, mFactor);
}

Expand Down
Loading