allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

merge 3578:4901 of thirdparty/rubberband/current

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@4982 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis
2009-04-16 00:53:20 +00:00
parent c2b12f05f4
commit 1ff9e8afc0
20 changed files with 125 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libs/rubberband/src/StretcherProcess.cpp
View File

@@ -67,7 +67,7 @@ RubberBandStretcher::Impl::ProcessThread::run()
m_dataAvailable.lock();
if (!m_s->testInbufReadSpace(m_channel) && !m_abandoning) {
m_dataAvailable.wait();
m_dataAvailable.wait(50000); // bounded in case of abandonment
} else {
m_dataAvailable.unlock();
}
@@ -448,8 +448,8 @@ RubberBandStretcher::Impl::calculateIncrements(size_t &phaseIncrementRtn,
if (m_channels == 1) {
df = m_phaseResetAudioCurve->process(cd.mag, m_increment);
silent = (m_silentAudioCurve->process(cd.mag, m_increment) > 0.f);
df = m_phaseResetAudioCurve->processDouble(cd.mag, m_increment);
silent = (m_silentAudioCurve->processDouble(cd.mag, m_increment) > 0.f);
} else {
@@ -464,8 +464,8 @@ RubberBandStretcher::Impl::calculateIncrements(size_t &phaseIncrementRtn,
}
}
df = m_phaseResetAudioCurve->process(tmp, m_increment);
silent = (m_silentAudioCurve->process(tmp, m_increment) > 0.f);
df = m_phaseResetAudioCurve->processDouble(tmp, m_increment);
silent = (m_silentAudioCurve->processDouble(tmp, m_increment) > 0.f);
}
int incr = m_stretchCalculator->calculateSingle
@@ -736,7 +736,7 @@ RubberBandStretcher::Impl::modifyChunk(size_t channel,
bool inherit = false;
if (laminar) {
if (distance >= mi) {
if (distance >= mi || i == count) {
inherit = false;
} else if (bandlimited && (i == bandhigh || i == bandlow)) {
inherit = false;