Signalsmith-Audio/signalsmith-stretch
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Restore up-front vertical phase-twist calculations and prediction weighting

Browse Source
This commit is contained in:
Geraint 2022-12-18 02:06:22 +00:00
parent f72fa99cfa
commit 7ca6c8d13c
1 changed files with 16 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
signalsmith-stretch.h
View File

@ -311,9 +311,8 @@ private:
std::vector<PitchMapPoint> outputMap; std::vector<PitchMapPoint> outputMap;
struct Prediction { struct Prediction {
Sample energy; Sample energy = 0;
Complex input; Complex input;
bool hasShortVertical = false, hasLongVertical = false;
Complex shortVerticalTwist, longVerticalTwist; Complex shortVerticalTwist, longVerticalTwist;
Complex makeOutput(Complex phase) { Complex makeOutput(Complex phase) {
@ -347,6 +346,7 @@ private:
} }
Sample smoothingBins = Sample(stft.fftSize())/stft.interval(); Sample smoothingBins = Sample(stft.fftSize())/stft.interval();
int longVerticalStep = std::round(smoothingBins);
findPeaks(smoothingBins); findPeaks(smoothingBins);
updateOutputMap(smoothingBins); updateOutputMap(smoothingBins);
@ -368,12 +368,24 @@ private:
Complex prevInput = getFractional<&Band::prevInput>(c, lowIndex, fracIndex); Complex prevInput = getFractional<&Band::prevInput>(c, lowIndex, fracIndex);
Complex freqTwist = signalsmith::perf::mul<true>(prediction.input, prevInput); Complex freqTwist = signalsmith::perf::mul<true>(prediction.input, prevInput);
Complex phase = signalsmith::perf::mul(outputBin.prevOutput, freqTwist); Complex phase = signalsmith::perf::mul(outputBin.prevOutput, freqTwist);
outputBin.output = prediction.makeOutput(phase); outputBin.output = phase/(prediction.energy + noiseFloor);
if (b > 0) {
Complex downInput = getFractional<&Band::input>(c, mapPoint.inputBin - timeFactor);
prediction.shortVerticalTwist = signalsmith::perf::mul<true>(prediction.input, downInput);
if (b >= longVerticalStep) {
Complex longDownInput = getFractional<&Band::input>(c, mapPoint.inputBin - longVerticalStep*timeFactor);
prediction.longVerticalTwist = signalsmith::perf::mul<true>(prediction.input, longDownInput);
} else {
prediction.longVerticalTwist = 0;
}
} else {
prediction.shortVerticalTwist = prediction.longVerticalTwist = 0;
}
} }
} }
// Re-predict using phase differences between frequencies // Re-predict using phase differences between frequencies
int longVerticalStep = std::round(smoothingBins);
for (int b = 0; b < stft.bands(); ++b) { for (int b = 0; b < stft.bands(); ++b) {
// Find maximum-energy channel and calculate that // Find maximum-energy channel and calculate that
int maxChannel = 0; int maxChannel = 0;
@ -396,18 +408,10 @@ private:
// Upwards vertical steps // Upwards vertical steps
if (b > 0) { if (b > 0) {
if (!prediction.hasShortVertical) {
Complex downInput = getFractional<&Band::input>(maxChannel, mapPoint.inputBin - timeFactor);
prediction.shortVerticalTwist = signalsmith::perf::mul<true>(prediction.input, downInput);
}
auto &downBin = bins[b - 1]; auto &downBin = bins[b - 1];
phase += signalsmith::perf::mul(downBin.output, prediction.shortVerticalTwist); phase += signalsmith::perf::mul(downBin.output, prediction.shortVerticalTwist);
if (b >= longVerticalStep) { if (b >= longVerticalStep) {
if (!prediction.hasLongVertical) {
Complex longDownInput = getFractional<&Band::input>(maxChannel, mapPoint.inputBin - longVerticalStep*timeFactor);
prediction.longVerticalTwist = signalsmith::perf::mul<true>(prediction.input, longDownInput);
}
auto &longDownBin = bins[b - longVerticalStep]; auto &longDownBin = bins[b - longVerticalStep];
phase += signalsmith::perf::mul(longDownBin.output, prediction.longVerticalTwist); phase += signalsmith::perf::mul(longDownBin.output, prediction.longVerticalTwist);
} }
@ -415,23 +419,11 @@ private:
// Downwards vertical steps // Downwards vertical steps
if (b < stft.bands() - 1) { if (b < stft.bands() - 1) {
auto &upPrediction = predictions[b + 1]; auto &upPrediction = predictions[b + 1];
{ // upwards short vertical twist
auto upMapPoint = outputMap[b + 1];
Complex upInput = getFractional<&Band::input>(maxChannel, upMapPoint.inputBin - timeFactor);
upPrediction.shortVerticalTwist = signalsmith::perf::mul<true>(upPrediction.input, upInput);
upPrediction.hasShortVertical = true;
}
auto &upBin = bins[b + 1]; auto &upBin = bins[b + 1];
phase += signalsmith::perf::mul<true>(upBin.output, upPrediction.shortVerticalTwist); phase += signalsmith::perf::mul<true>(upBin.output, upPrediction.shortVerticalTwist);
if (b < stft.bands() - longVerticalStep) { if (b < stft.bands() - longVerticalStep) {
auto &longUpPrediction = predictions[b + longVerticalStep]; auto &longUpPrediction = predictions[b + longVerticalStep];
{ // upwards long vertical twist
auto longUpMapPoint = outputMap[b + longVerticalStep];
Complex longUpInput = getFractional<&Band::input>(maxChannel, longUpMapPoint.inputBin - longVerticalStep*timeFactor);
longUpPrediction.longVerticalTwist = signalsmith::perf::mul<true>(longUpPrediction.input, longUpInput);
longUpPrediction.hasLongVertical = true;
}
auto &longUpBin = bins[b + longVerticalStep]; auto &longUpBin = bins[b + longVerticalStep];
phase += signalsmith::perf::mul<true>(longUpBin.output, longUpPrediction.longVerticalTwist); phase += signalsmith::perf::mul<true>(longUpBin.output, longUpPrediction.longVerticalTwist);
} }