david/librubberband
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

An attempt to do the right thing when the hop changes - but this is not enough

Browse Source
This commit is contained in:
Chris Cannam
2022-05-26 15:08:07 +01:00
parent b07f74e5b9
commit 83f2b7607b
3 changed files with 82 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/finer/R3StretcherImpl.h
View File

@@ -182,21 +182,10 @@ protected:
synthesisWindowLength(fftSize)),
guided(guidedParameters) { }
WindowType analysisWindowShape(int fftSize) {
if (fftSize == 4096) return HannWindow;
else return NiemitaloForwardWindow;
}
int analysisWindowLength(int fftSize) {
return fftSize;
}
WindowType synthesisWindowShape(int fftSize) {
if (fftSize == 4096) return HannWindow;
else return NiemitaloReverseWindow;
}
int synthesisWindowLength(int fftSize) {
if (fftSize == 4096) return fftSize/2;
else return fftSize;
}
WindowType analysisWindowShape(int fftSize);
int analysisWindowLength(int fftSize);
WindowType synthesisWindowShape(int fftSize);
int synthesisWindowLength(int fftSize);
};
Parameters m_parameters;
@@ -213,12 +202,13 @@ protected:
std::unique_ptr<StretchCalculator> m_calculator;
std::unique_ptr<Resampler> m_resampler;
std::atomic<int> m_inhop;
int m_prevInhop;
int m_prevOuthop;
bool m_draining;
void consume();
void calculateHop();
void analyseChannel(int channel, int inhop, int prevOuthop);
void analyseChannel(int channel, int inhop, int prevInhop, int prevOuthop);
void synthesiseChannel(int channel, int outhop);
double getEffectiveRatio() const {