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

Experimental preKick to slightly reduce frame just before kick and boost kick accordingly

Browse Source
This commit is contained in:
Chris Cannam
2022-06-13 09:40:26 +01:00
parent 321a89e372
commit 05fb611544
4 changed files with 77 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/finer/R3StretcherImpl.cpp
View File

@@ -436,6 +436,10 @@ R3StretcherImpl::consume()
m_prevOuthop);
}
for (int c = 0; c < channels; ++c) {
adjustPreKick(c);
}
// Resynthesis
for (int c = 0; c < channels; ++c) {
@@ -701,18 +705,30 @@ R3StretcherImpl::analyseChannel(int c, int inhop, int prevInhop, int prevOuthop)
}
std::cout << std::endl;
}
*/
*/
double instantaneousRatio = double(prevOuthop) / double(prevInhop);
bool specialCaseUnity = true;
m_guide.updateGuidance(instantaneousRatio,
classifyScale->mag.data(),
classifyScale->prevMag.data(),
cd->readahead.mag.data(),
cd->segmentation,
cd->prevSegmentation,
cd->nextSegmentation,
specialCaseUnity,
cd->guidance);
/*
if (c == 0) {
if (cd->guidance.kick.present) {
std::cout << "k:2" << std::endl;
} else if (cd->guidance.preKick.present) {
std::cout << "k:1" << std::endl;
} else {
std::cout << "k:0" << std::endl;
}
}
*/
}
void
@@ -781,6 +797,33 @@ R3StretcherImpl::adjustFormant(int c)
}
}
void
R3StretcherImpl::adjustPreKick(int c)
{
auto &cd = m_channelData.at(c);
auto fftSize = cd->guidance.fftBands[0].fftSize;
if (cd->guidance.preKick.present) {
auto &scale = cd->scales.at(fftSize);
int from = binForFrequency(cd->guidance.preKick.f0, fftSize);
int to = binForFrequency(cd->guidance.preKick.f1, fftSize);
for (int i = from; i <= to; ++i) {
double diff = scale->mag[i] - scale->prevMag[i];
if (diff > 0.0) {
scale->pendingKick[i] = diff;
scale->mag[i] -= diff;
}
}
} else if (cd->guidance.kick.present) {
auto &scale = cd->scales.at(fftSize);
int from = binForFrequency(cd->guidance.preKick.f0, fftSize);
int to = binForFrequency(cd->guidance.preKick.f1, fftSize);
for (int i = from; i <= to; ++i) {
scale->mag[i] += scale->pendingKick[i];
scale->pendingKick[i] = 0.0;
}
}
}
void
R3StretcherImpl::synthesiseChannel(int c, int outhop)
{