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

* More documentative bits

Browse Source
This commit is contained in:
Chris Cannam
2007-12-10 22:20:07 +00:00
parent 63ca65b931
commit 92b63b086a
4 changed files with 53 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/StretcherImpl.cpp
View File

@@ -854,7 +854,7 @@ RubberBandStretcher::Impl::getSamplesRequired() const
size_t rs = inbuf.getReadSpace();
// See notes in testInbufReadSpace below
// See notes in testInbufReadSpace
if (rs < m_windowSize && !cd.draining) {

8
src/StretcherProcess.cpp
View File

@@ -49,10 +49,10 @@ RubberBandStretcher::Impl::ProcessThread::run()
while (cd.inputSize == -1 ||
cd.inbuf->getReadSpace() > 0) {
if (cd.inputSize != -1) {
cerr << "inputSize == " << cd.inputSize
<< ", readSpace == " << cd.inbuf->getReadSpace() << endl;
}
// if (cd.inputSize != -1) {
// cerr << "inputSize == " << cd.inputSize
// << ", readSpace == " << cd.inbuf->getReadSpace() << endl;
// }
bool any = false, last = false;
m_s->processChunks(m_channel, any, last);

31
src/main.cpp
View File

@@ -188,6 +188,19 @@ int main(int argc, char **argv)
case 5: transients = Transients; peaklock = false; longwin = false; shortwin = true; break;
};
if (!quiet) {
cerr << "Using crispness level: " << crispness << " (";
switch (crispness) {
case 0: cerr << "Mushy"; break;
case 1: cerr << "Smooth"; break;
case 2: cerr << "Balanced multitimbral mixture"; break;
case 3: cerr << "Unpitched percussion with stable notes"; break;
case 4: cerr << "Crisp monophonic instrumental"; break;
case 5: cerr << "Unpitched solo percussion"; break;
}
cerr << ")" << endl;
}
char *fileName = strdup(argv[optind++]);
char *fileNameOut = strdup(argv[optind++]);
@@ -323,10 +336,6 @@ int main(int argc, char **argv)
frame = 0;
percent = 0;
float inpeak = 0;
double insum = 0;
float outpeak = 0.0;
double outsum = 0.0;
size_t countIn = 0, countOut = 0;
while (frame < sfinfo.frames) {
@@ -341,8 +350,6 @@ int main(int argc, char **argv)
for (int i = 0; i < count; ++i) {
float value = fbuf[i * channels + c];
ibuf[c][i] = value;
if (fabsf(value) > inpeak) inpeak = fabsf(value);
insum += value * value;
}
}
@@ -364,8 +371,6 @@ int main(int argc, char **argv)
for (size_t c = 0; c < channels; ++c) {
for (int i = 0; i < avail; ++i) {
float value = obf[c][i];
if (fabsf(value) > outpeak) outpeak = fabsf(value);
outsum += value * value;
if (value > 1.f) value = 1.f;
if (value < -1.f) value = -1.f;
fobf[i * channels + c] = value;
@@ -423,8 +428,6 @@ int main(int argc, char **argv)
for (size_t c = 0; c < channels; ++c) {
for (int i = 0; i < avail; ++i) {
float value = obf[c][i];
if (fabsf(value) > outpeak) outpeak = fabsf(value);
outsum += value * value;
if (value > 1.f) value = 1.f;
if (value < -1.f) value = -1.f;
fobf[i * channels + c] = value;
@@ -445,16 +448,10 @@ int main(int argc, char **argv)
sf_close(sndfile);
sf_close(sndfileOut);
double inmean = sqrt(insum / (sfinfo.frames * sfinfo.channels));
double outmean = sqrt(outsum / (countOut * sfinfo.channels));
if (!quiet) {
cerr << "in: " << countIn << ", out: " << countOut << ", ratio: " << float(countOut)/float(countIn) << ", ideal output: " << lrint(countIn * ratio) << ", error: " << abs(lrint(countIn * ratio) - int(countOut)) << endl;
cerr << "input peak: " << inpeak << "; output peak " << outpeak << "; gain " << (inpeak > 0 ? outpeak/inpeak : 1) << endl;
cerr << "input rms: " << inmean << "; output rms " << outmean << "; gain " << (inmean > 0 ? outmean/inmean : 1) << endl;
#ifdef _WIN32
RubberBand::
#endif
@@ -469,7 +466,7 @@ int main(int argc, char **argv)
etv.tv_usec -= tv.tv_usec;
double sec = double(etv.tv_sec) + (double(etv.tv_usec) / 1000000.0);
cerr << "\nelapsed time: " << sec << " sec, in frames/sec: " << countIn/sec << ", out frames/sec: " << countOut/sec << endl;
cerr << "elapsed time: " << sec << " sec, in frames/sec: " << countIn/sec << ", out frames/sec: " << countOut/sec << endl;
}
return 0;