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

Use atomics for inhop and ratio, and read inhop once at start of consume in case it changes within

Browse Source
This commit is contained in:
Chris Cannam
2022-05-25 14:10:41 +01:00
parent 7d91fdb1b6
commit 630a790ef8
2 changed files with 35 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/finer/R3StretcherImpl.h
View File

@@ -181,8 +181,8 @@ protected:
Parameters m_parameters;
double m_timeRatio;
double m_pitchScale;
std::atomic<double> m_timeRatio;
std::atomic<double> m_pitchScale;
std::vector<std::shared_ptr<ChannelData>> m_channelData;
std::map<int, std::shared_ptr<ScaleData>> m_scaleData;
@@ -192,13 +192,13 @@ protected:
Peak<double, std::less<double>> m_troughPicker;
std::unique_ptr<StretchCalculator> m_calculator;
std::unique_ptr<Resampler> m_resampler;
int m_inhop;
std::atomic<int> m_inhop;
int m_prevOuthop;
bool m_draining;
void consume();
void calculateHop();
void analyseChannel(int channel, int prevOuthop);
void analyseChannel(int channel, int inhop, int prevOuthop);
void synthesiseChannel(int channel, int outhop);
double getEffectiveRatio() const {