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

Further logging updates

Browse Source
This commit is contained in:
Chris Cannam
2022-06-21 20:26:25 +01:00
parent 7434abe664
commit ad5b885deb
2 changed files with 19 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/faster/R2Stretcher.cpp
View File

@@ -126,17 +126,13 @@ R2Stretcher::R2Stretcher(size_t sampleRate,
(options & RubberBandStretcher::OptionWindowLong)) { (options & RubberBandStretcher::OptionWindowLong)) {
if ((options & RubberBandStretcher::OptionWindowShort) && if ((options & RubberBandStretcher::OptionWindowShort) &&
(options & RubberBandStretcher::OptionWindowLong)) { (options & RubberBandStretcher::OptionWindowLong)) {
cerr << "R2Stretcher::R2Stretcher: Cannot specify OptionWindowLong and OptionWindowShort together; falling back to OptionWindowStandard" << endl; m_log.log0(0, "R2Stretcher::R2Stretcher: Cannot specify OptionWindowLong and OptionWindowShort together; falling back to OptionWindowStandard");
} else if (options & RubberBandStretcher::OptionWindowShort) { } else if (options & RubberBandStretcher::OptionWindowShort) {
m_baseFftSize = m_baseFftSize / 2; m_baseFftSize = m_baseFftSize / 2;
if (m_debugLevel > 0) { m_log.log1(1, "setting baseFftSize", m_baseFftSize);
cerr << "setting baseFftSize to " << m_baseFftSize << endl;
}
} else if (options & RubberBandStretcher::OptionWindowLong) { } else if (options & RubberBandStretcher::OptionWindowLong) {
m_baseFftSize = m_baseFftSize * 2; m_baseFftSize = m_baseFftSize * 2;
if (m_debugLevel > 0) { m_log.log1(1, "setting baseFftSize", m_baseFftSize);
cerr << "setting baseFftSize to " << m_baseFftSize << endl;
}
} }
m_fftSize = m_baseFftSize; m_fftSize = m_baseFftSize;
m_aWindowSize = m_baseFftSize; m_aWindowSize = m_baseFftSize;
@@ -163,8 +159,8 @@ R2Stretcher::R2Stretcher(size_t sampleRate,
m_threaded = false; m_threaded = false;
} }
if (m_threaded && m_debugLevel > 0) { if (m_threaded) {
cerr << "Going multithreaded..." << endl; m_log.log0(1, "Going multithreaded...");
} }
} }
#endif #endif
@@ -179,9 +175,7 @@ R2Stretcher::~R2Stretcher()
MutexLocker locker(&m_threadSetMutex); MutexLocker locker(&m_threadSetMutex);
for (set<ProcessThread *>::iterator i = m_threadSet.begin(); for (set<ProcessThread *>::iterator i = m_threadSet.begin();
i != m_threadSet.end(); ++i) { i != m_threadSet.end(); ++i) {
if (m_debugLevel > 0) { m_log.log1(1, "RubberBandStretcher::~RubberBandStretcher: joining for channel", (*i)->channel());
cerr << "RubberBandStretcher::~RubberBandStretcher: joining (channel " << *i << ")" << endl;
}
(*i)->abandon(); (*i)->abandon();
(*i)->wait(); (*i)->wait();
delete *i; delete *i;
@@ -216,9 +210,7 @@ R2Stretcher::reset()
m_threadSetMutex.lock(); m_threadSetMutex.lock();
for (set<ProcessThread *>::iterator i = m_threadSet.begin(); for (set<ProcessThread *>::iterator i = m_threadSet.begin();
i != m_threadSet.end(); ++i) { i != m_threadSet.end(); ++i) {
if (m_debugLevel > 0) { m_log.log1(1, "RubberBandStretcher::~RubberBandStretcher: joining for channel", (*i)->channel());
cerr << "RubberBandStretcher::~RubberBandStretcher: joining (channel " << *i << ")" << endl;
}
(*i)->abandon(); (*i)->abandon();
(*i)->wait(); (*i)->wait();
delete *i; delete *i;
@@ -255,7 +247,7 @@ R2Stretcher::setTimeRatio(double ratio)
{ {
if (!m_realtime) { if (!m_realtime) {
if (m_mode == Studying || m_mode == Processing) { if (m_mode == Studying || m_mode == Processing) {
cerr << "R2Stretcher::setTimeRatio: Cannot set ratio while studying or processing in non-RT mode" << endl; m_log.log0(0, "R2Stretcher::setTimeRatio: Cannot set ratio while studying or processing in non-RT mode");
return; return;
} }
} }
@@ -271,7 +263,7 @@ R2Stretcher::setPitchScale(double fs)
{ {
if (!m_realtime) { if (!m_realtime) {
if (m_mode == Studying || m_mode == Processing) { if (m_mode == Studying || m_mode == Processing) {
cerr << "R2Stretcher::setPitchScale: Cannot set ratio while studying or processing in non-RT mode" << endl; m_log.log0(0, "R2Stretcher::setPitchScale: Cannot set ratio while studying or processing in non-RT mode");
return; return;
} }
} }
@@ -333,11 +325,11 @@ R2Stretcher::setKeyFrameMap(const std::map<size_t, size_t> &
mapping) mapping)
{ {
if (m_realtime) { if (m_realtime) {
cerr << "R2Stretcher::setKeyFrameMap: Cannot specify key frame map in RT mode" << endl; m_log.log0(0, "R2Stretcher::setKeyFrameMap: Cannot specify key frame map in RT mode");
return; return;
} }
if (m_mode == Processing) { if (m_mode == Processing) {
cerr << "R2Stretcher::setKeyFrameMap: Cannot specify key frame map after process() has begun" << endl; m_log.log0(0, "R2Stretcher::setKeyFrameMap: Cannot specify key frame map after process() has begun");
return; return;
} }
@@ -405,12 +397,12 @@ R2Stretcher::calculateSizes()
// This special case is likelier than one might hope, because // This special case is likelier than one might hope, because
// of naive initialisations in programs that set it from a // of naive initialisations in programs that set it from a
// variable // variable
std::cerr << "RubberBandStretcher: WARNING: Pitch scale must be greater than zero!\nResetting it from " << m_pitchScale << " to the default of 1.0: no pitch change will occur" << std::endl; m_log.log1(0, "WARNING: Pitch scale must be greater than zero! Resetting it to default, no pitch shift will happen", m_pitchScale);
m_pitchScale = 1.0; m_pitchScale = 1.0;
} }
if (m_timeRatio <= 0.0) { if (m_timeRatio <= 0.0) {
// Likewise // Likewise
std::cerr << "RubberBandStretcher: WARNING: Time ratio must be greater than zero!\nResetting it from " << m_timeRatio << " to the default of 1.0: no time stretch will occur" << std::endl; m_log.log1(0, "WARNING: Time ratio must be greater than zero! Resetting it to default, no time stretch will happen", m_timeRatio);
m_timeRatio = 1.0; m_timeRatio = 1.0;
} }
@@ -532,10 +524,11 @@ R2Stretcher::calculateSizes()
// twice the basic output increment (i.e. input increment times // twice the basic output increment (i.e. input increment times
// ratio) for any chunk. // ratio) for any chunk.
if (m_debugLevel > 0) { m_log.log2(1, "calculateSizes: time ratio and pitch scale", m_timeRatio, m_pitchScale);
cerr << "calculateSizes: time ratio = " << m_timeRatio << ", pitch scale = " << m_pitchScale << ", effective ratio = " << getEffectiveRatio() << endl; m_log.log1(1, "effective ratio", getEffectiveRatio());
cerr << "calculateSizes: analysis window size = " << m_aWindowSize << ", synthesis window size = " << m_sWindowSize << ", fft size = " << m_fftSize << ", increment = " << m_increment << " (approx output increment = " << int(lrint(m_increment * getEffectiveRatio())) << ")" << endl; m_log.log2(1, "analysis and synthesis window sizes", m_aWindowSize, m_sWindowSize);
} m_log.log1(1, "fft size", m_fftSize);
m_log.log2(1, "input increment and mean output increment", m_increment, m_increment * getEffectiveRatio());
if (std::max(m_aWindowSize, m_sWindowSize) > m_maxProcessSize) { if (std::max(m_aWindowSize, m_sWindowSize) > m_maxProcessSize) {
m_maxProcessSize = std::max(m_aWindowSize, m_sWindowSize); m_maxProcessSize = std::max(m_aWindowSize, m_sWindowSize);

1
src/faster/R2Stretcher.h
View File

@@ -205,6 +205,7 @@ protected:
void run(); void run();
void signalDataAvailable(); void signalDataAvailable();
void abandon(); void abandon();
size_t channel() { return m_channel; }
private: private:
R2Stretcher *m_s; R2Stretcher *m_s;
size_t m_channel; size_t m_channel;