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

* Update for newer take on the C wrapper API

Browse Source 
* Add library versioning and DESTDIR support
This commit is contained in:
Chris Cannam
2008-07-01 10:25:17 +00:00
parent 160143461d
commit c70480bb3c
15 changed files with 516 additions and 320 deletions
Download Patch File Download Diff File Expand all files Collapse all files

102
src/StretcherProcess.cpp
View File

@@ -33,7 +33,7 @@ using std::endl;
namespace RubberBand {
StretcherImpl::ProcessThread::ProcessThread(StretcherImpl *s, size_t c) :
RubberBandStretcher::Impl::ProcessThread::ProcessThread(Impl *s, size_t c) :
m_s(s),
m_channel(c),
m_dataAvailable(std::string("data ") + char('A' + c)),
@@ -41,7 +41,7 @@ StretcherImpl::ProcessThread::ProcessThread(StretcherImpl *s, size_t c) :
{ }
void
StretcherImpl::ProcessThread::run()
RubberBandStretcher::Impl::ProcessThread::run()
{
if (m_s->m_debugLevel > 1) {
cerr << "thread " << m_channel << " getting going" << endl;
@@ -89,26 +89,26 @@ StretcherImpl::ProcessThread::run()
}
void
StretcherImpl::ProcessThread::signalDataAvailable()
RubberBandStretcher::Impl::ProcessThread::signalDataAvailable()
{
m_dataAvailable.signal();
}
void
StretcherImpl::ProcessThread::abandon()
RubberBandStretcher::Impl::ProcessThread::abandon()
{
m_abandoning = true;
}
bool
StretcherImpl::resampleBeforeStretching() const
RubberBandStretcher::Impl::resampleBeforeStretching() const
{
// We can't resample before stretching in offline mode, because
// the stretch calculation is based on doing it the other way
// around. It would take more work (and testing) to enable this.
if (!m_realtime) return false;
if (m_options & RubberBandStretcher::OptionPitchHighQuality) {
if (m_options & OptionPitchHighQuality) {
return (m_pitchScale < 1.0); // better sound
} else {
return (m_pitchScale > 1.0); // better performance
@@ -116,10 +116,10 @@ StretcherImpl::resampleBeforeStretching() const
}
size_t
StretcherImpl::consumeChannel(size_t c, const float *input,
RubberBandStretcher::Impl::consumeChannel(size_t c, const float *input,
size_t samples, bool final)
{
Profiler profiler("StretcherImpl::consumeChannel");
Profiler profiler("RubberBandStretcher::Impl::consumeChannel");
ChannelData &cd = *m_channelData[c];
RingBuffer<float> &inbuf = *cd.inbuf;
@@ -139,7 +139,7 @@ StretcherImpl::consumeChannel(size_t c, const float *input,
size_t reqSize = int(ceil(samples / m_pitchScale));
if (reqSize > cd.resamplebufSize) {
cerr << "WARNING: StretcherImpl::consumeChannel: resizing resampler buffer from "
cerr << "WARNING: RubberBandStretcher::Impl::consumeChannel: resizing resampler buffer from "
<< cd.resamplebufSize << " to " << reqSize << endl;
cd.setResampleBufSize(reqSize);
}
@@ -172,9 +172,9 @@ StretcherImpl::consumeChannel(size_t c, const float *input,
}
void
StretcherImpl::processChunks(size_t c, bool &any, bool &last)
RubberBandStretcher::Impl::processChunks(size_t c, bool &any, bool &last)
{
Profiler profiler("StretcherImpl::processChunks");
Profiler profiler("RubberBandStretcher::Impl::processChunks");
// Process as many chunks as there are available on the input
// buffer for channel c. This requires that the increments have
@@ -214,9 +214,9 @@ StretcherImpl::processChunks(size_t c, bool &any, bool &last)
}
bool
StretcherImpl::processOneChunk()
RubberBandStretcher::Impl::processOneChunk()
{
Profiler profiler("StretcherImpl::processOneChunk");
Profiler profiler("RubberBandStretcher::Impl::processOneChunk");
// Process a single chunk for all channels, provided there is
// enough data on each channel for at least one chunk. This is
@@ -249,9 +249,9 @@ StretcherImpl::processOneChunk()
}
bool
StretcherImpl::testInbufReadSpace(size_t c)
RubberBandStretcher::Impl::testInbufReadSpace(size_t c)
{
Profiler profiler("StretcherImpl::testInbufReadSpace");
Profiler profiler("RubberBandStretcher::Impl::testInbufReadSpace");
ChannelData &cd = *m_channelData[c];
RingBuffer<float> &inbuf = *cd.inbuf;
@@ -298,12 +298,12 @@ StretcherImpl::testInbufReadSpace(size_t c)
}
bool
StretcherImpl::processChunkForChannel(size_t c,
RubberBandStretcher::Impl::processChunkForChannel(size_t c,
size_t phaseIncrement,
size_t shiftIncrement,
bool phaseReset)
{
Profiler profiler("StretcherImpl::processChunkForChannel");
Profiler profiler("RubberBandStretcher::Impl::processChunkForChannel");
// Process a single chunk on a single channel. This assumes
// enough input data is available; caller must have tested this
@@ -393,11 +393,11 @@ StretcherImpl::processChunkForChannel(size_t c,
}
void
StretcherImpl::calculateIncrements(size_t &phaseIncrementRtn,
RubberBandStretcher::Impl::calculateIncrements(size_t &phaseIncrementRtn,
size_t &shiftIncrementRtn,
bool &phaseReset)
{
Profiler profiler("StretcherImpl::calculateIncrements");
Profiler profiler("RubberBandStretcher::Impl::calculateIncrements");
// cerr << "calculateIncrements" << endl;
@@ -423,7 +423,7 @@ StretcherImpl::calculateIncrements(size_t &phaseIncrementRtn,
size_t bc = cd.chunkCount;
for (size_t c = 1; c < m_channels; ++c) {
if (m_channelData[c]->chunkCount != bc) {
cerr << "ERROR: StretcherImpl::calculateIncrements: Channels are not in sync" << endl;
cerr << "ERROR: RubberBandStretcher::Impl::calculateIncrements: Channels are not in sync" << endl;
return;
}
}
@@ -498,12 +498,12 @@ StretcherImpl::calculateIncrements(size_t &phaseIncrementRtn,
}
bool
StretcherImpl::getIncrements(size_t channel,
RubberBandStretcher::Impl::getIncrements(size_t channel,
size_t &phaseIncrementRtn,
size_t &shiftIncrementRtn,
bool &phaseReset)
{
Profiler profiler("StretcherImpl::getIncrements");
Profiler profiler("RubberBandStretcher::Impl::getIncrements");
if (channel >= m_channels) {
phaseIncrementRtn = m_increment;
@@ -532,7 +532,7 @@ StretcherImpl::getIncrements(size_t channel,
bool gotData = true;
if (cd.chunkCount >= m_outputIncrements.size()) {
// cerr << "WARNING: StretcherImpl::getIncrements:"
// cerr << "WARNING: RubberBandStretcher::Impl::getIncrements:"
// << " chunk count " << cd.chunkCount << " >= "
// << m_outputIncrements.size() << endl;
if (m_outputIncrements.size() == 0) {
@@ -563,7 +563,7 @@ StretcherImpl::getIncrements(size_t channel,
}
if (shiftIncrement >= int(m_windowSize)) {
cerr << "*** ERROR: StretcherImpl::processChunks: shiftIncrement " << shiftIncrement << " >= windowSize " << m_windowSize << " at " << cd.chunkCount << " (of " << m_outputIncrements.size() << ")" << endl;
cerr << "*** ERROR: RubberBandStretcher::Impl::processChunks: shiftIncrement " << shiftIncrement << " >= windowSize " << m_windowSize << " at " << cd.chunkCount << " (of " << m_outputIncrements.size() << ")" << endl;
shiftIncrement = m_windowSize;
}
@@ -574,9 +574,9 @@ StretcherImpl::getIncrements(size_t channel,
}
void
StretcherImpl::analyseChunk(size_t channel)
RubberBandStretcher::Impl::analyseChunk(size_t channel)
{
Profiler profiler("StretcherImpl::analyseChunk");
Profiler profiler("RubberBandStretcher::Impl::analyseChunk");
int i;
@@ -627,10 +627,10 @@ static inline double mod(double x, double y) { return x - (y * floor(x / y)); }
static inline double princarg(double a) { return mod(a + M_PI, -2.0 * M_PI) + M_PI; }
void
StretcherImpl::modifyChunk(size_t channel, size_t outputIncrement,
RubberBandStretcher::Impl::modifyChunk(size_t channel, size_t outputIncrement,
bool phaseReset)
{
Profiler profiler("StretcherImpl::modifyChunk");
Profiler profiler("RubberBandStretcher::Impl::modifyChunk");
ChannelData &cd = *m_channelData[channel];
@@ -648,7 +648,7 @@ StretcherImpl::modifyChunk(size_t channel, size_t outputIncrement,
bool unchanged = cd.unchanged && (outputIncrement == m_increment);
bool fullReset = phaseReset;
if (!(m_options & RubberBandStretcher::OptionPhaseIndependent)) {
if (!(m_options & OptionPhaseIndependent)) {
cd.freqPeak[0] = 0;
@@ -664,7 +664,7 @@ StretcherImpl::modifyChunk(size_t channel, size_t outputIncrement,
// We only do this if the phase option is OptionPhaseAdaptive
// (the default), i.e. not Independent or PeakLocked.
if (!(m_options & RubberBandStretcher::OptionPhasePeakLocked)) {
if (!(m_options & OptionPhasePeakLocked)) {
float r = getEffectiveRatio();
if (r > 1) {
float rf0 = 600 + (600 * ((r-1)*(r-1)*(r-1)*2));
@@ -744,7 +744,7 @@ StretcherImpl::modifyChunk(size_t channel, size_t outputIncrement,
cd.freqPeak[count] = count;
}
Profiler profiler2("StretcherImpl::modifyChunk part 2");
Profiler profiler2("RubberBandStretcher::Impl::modifyChunk part 2");
double peakInPhase = 0.0;
double peakOutPhase = 0.0;
@@ -753,7 +753,7 @@ StretcherImpl::modifyChunk(size_t channel, size_t outputIncrement,
for (int i = 0; i <= count; ++i) {
if (m_options & RubberBandStretcher::OptionPhaseIndependent) {
if (m_options & OptionPhaseIndependent) {
p = i;
pp = i-1;
} else {
@@ -763,7 +763,7 @@ StretcherImpl::modifyChunk(size_t channel, size_t outputIncrement,
bool resetThis = phaseReset;
if (m_options & RubberBandStretcher::OptionTransientsMixed) {
if (m_options & OptionTransientsMixed) {
int low = lrint((150 * sz * cd.oversample) / rate);
int high = lrint((1000 * sz * cd.oversample) / rate);
if (resetThis) {
@@ -827,9 +827,9 @@ StretcherImpl::modifyChunk(size_t channel, size_t outputIncrement,
void
StretcherImpl::formantShiftChunk(size_t channel)
RubberBandStretcher::Impl::formantShiftChunk(size_t channel)
{
Profiler profiler("StretcherImpl::formantShiftChunk");
Profiler profiler("RubberBandStretcher::Impl::formantShiftChunk");
ChannelData &cd = *m_channelData[channel];
@@ -893,12 +893,12 @@ StretcherImpl::formantShiftChunk(size_t channel)
}
void
StretcherImpl::synthesiseChunk(size_t channel)
RubberBandStretcher::Impl::synthesiseChunk(size_t channel)
{
Profiler profiler("StretcherImpl::synthesiseChunk");
Profiler profiler("RubberBandStretcher::Impl::synthesiseChunk");
if ((m_options & RubberBandStretcher::OptionFormantPreserved) &&
if ((m_options & OptionFormantPreserved) &&
(m_pitchScale != 1.0)) {
formantShiftChunk(channel);
}
@@ -969,9 +969,9 @@ StretcherImpl::synthesiseChunk(size_t channel)
}
void
StretcherImpl::writeChunk(size_t channel, size_t shiftIncrement, bool last)
RubberBandStretcher::Impl::writeChunk(size_t channel, size_t shiftIncrement, bool last)
{
Profiler profiler("StretcherImpl::writeChunk");
Profiler profiler("RubberBandStretcher::Impl::writeChunk");
ChannelData &cd = *m_channelData[channel];
@@ -1011,7 +1011,7 @@ StretcherImpl::writeChunk(size_t channel, size_t shiftIncrement, bool last)
// first place. But we retain this check in case the
// pitch scale has changed since then, or the stretch
// calculator has gone mad, or something.
cerr << "WARNING: StretcherImpl::writeChunk: resizing resampler buffer from "
cerr << "WARNING: RubberBandStretcher::Impl::writeChunk: resizing resampler buffer from "
<< cd.resamplebufSize << " to " << reqSize << endl;
cd.setResampleBufSize(reqSize);
}
@@ -1054,7 +1054,7 @@ StretcherImpl::writeChunk(size_t channel, size_t shiftIncrement, bool last)
cd.accumulatorFill = 0;
if (cd.draining) {
if (m_debugLevel > 1) {
cerr << "StretcherImpl::processChunks: setting outputComplete to true" << endl;
cerr << "RubberBandStretcher::Impl::processChunks: setting outputComplete to true" << endl;
}
cd.outputComplete = true;
}
@@ -1062,9 +1062,9 @@ StretcherImpl::writeChunk(size_t channel, size_t shiftIncrement, bool last)
}
void
StretcherImpl::writeOutput(RingBuffer<float> &to, float *from, size_t qty, size_t &outCount, size_t theoreticalOut)
RubberBandStretcher::Impl::writeOutput(RingBuffer<float> &to, float *from, size_t qty, size_t &outCount, size_t theoreticalOut)
{
Profiler profiler("StretcherImpl::writeOutput");
Profiler profiler("RubberBandStretcher::Impl::writeOutput");
// In non-RT mode, we don't want to write the first startSkip
// samples, because the first chunk is centred on the start of the
@@ -1103,7 +1103,7 @@ StretcherImpl::writeOutput(RingBuffer<float> &to, float *from, size_t qty, size_
size_t written = to.write(from, qty);
if (written < qty) {
cerr << "WARNING: StretcherImpl::writeOutput: "
cerr << "WARNING: RubberBandStretcher::Impl::writeOutput: "
<< "Buffer overrun on output: wrote " << written
<< " of " << qty << " samples" << endl;
}
@@ -1136,9 +1136,9 @@ StretcherImpl::writeOutput(RingBuffer<float> &to, float *from, size_t qty, size_
}
int
StretcherImpl::available() const
RubberBandStretcher::Impl::available() const
{
Profiler profiler("StretcherImpl::available");
Profiler profiler("RubberBandStretcher::Impl::available");
if (m_threaded) {
MutexLocker locker(&m_threadSetMutex);
@@ -1156,7 +1156,7 @@ StretcherImpl::available() const
//!!! do we ever actually do this? if so, this method should not be const
// ^^^ yes, we do sometimes -- e.g. when fed a very short file
bool any = false, last = false;
((StretcherImpl *)this)->processChunks(c, any, last);
((RubberBandStretcher::Impl *)this)->processChunks(c, any, last);
}
}
}
@@ -1185,9 +1185,9 @@ StretcherImpl::available() const
}
size_t
StretcherImpl::retrieve(float *const *output, size_t samples) const
RubberBandStretcher::Impl::retrieve(float *const *output, size_t samples) const
{
Profiler profiler("StretcherImpl::retrieve");
Profiler profiler("RubberBandStretcher::Impl::retrieve");
size_t got = samples;
@@ -1196,7 +1196,7 @@ StretcherImpl::retrieve(float *const *output, size_t samples) const
if (gotHere < got) {
if (c > 0) {
if (m_debugLevel > 0) {
cerr << "StretcherImpl::retrieve: WARNING: channel imbalance detected" << endl;
cerr << "RubberBandStretcher::Impl::retrieve: WARNING: channel imbalance detected" << endl;
}
}
got = gotHere;