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

Performance tweak to make it almost usable in Debug

Browse Source
This commit is contained in:
Geraint 2022-11-29 15:54:11 +00:00
parent 31a4c2b5ba
commit 450b2fecce
1 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
signalsmith-stretch.h
View File

@ -4,6 +4,7 @@
#include "dsp/spectral.h" #include "dsp/spectral.h"
#include "dsp/delay.h" #include "dsp/delay.h"
#include "dsp/curves.h" #include "dsp/curves.h"
#include "dsp/perf.h"
SIGNALSMITH_DSP_VERSION_CHECK(1, 3, 3); // Check version is compatible SIGNALSMITH_DSP_VERSION_CHECK(1, 3, 3); // Check version is compatible
#include <vector> #include <vector>
#include <algorithm> #include <algorithm>
@ -51,6 +52,7 @@ struct SignalsmithStretch {
// Various phase rotations // Various phase rotations
rotCentreSpectrum.resize(stft.bands()); rotCentreSpectrum.resize(stft.bands());
rotPrevInput.assign(stft.bands(), 0); rotPrevInput.assign(stft.bands(), 0);
rotPrevInputShift = -1;
rotPrevOutput.resize(stft.bands()); rotPrevOutput.resize(stft.bands());
timeShiftPhases(blockSamples*Sample(-0.5), rotCentreSpectrum); timeShiftPhases(blockSamples*Sample(-0.5), rotCentreSpectrum);
timeShiftPhases(-intervalSamples, rotPrevOutput); timeShiftPhases(-intervalSamples, rotPrevOutput);
@ -126,7 +128,10 @@ struct SignalsmithStretch {
prevInputOffset = inputOffset; prevInputOffset = inputOffset;
if (inputInterval > 0) { if (inputInterval > 0) {
timeShiftPhases(-inputInterval, rotPrevInput); if (inputInterval != rotPrevInputShift) { // Only recompute if needed
timeShiftPhases(-inputInterval, rotPrevInput);
rotPrevInputShift = inputInterval;
}
for (int c = 0; c < channels; ++c) { for (int c = 0; c < channels; ++c) {
// Copy from the history buffer, if needed // Copy from the history buffer, if needed
auto &&bufferChannel = inputBuffer[c]; auto &&bufferChannel = inputBuffer[c];
@ -146,7 +151,7 @@ struct SignalsmithStretch {
auto bands = bandsForChannel(c); auto bands = bandsForChannel(c);
auto &&spectrumBands = stft.spectrum[c]; auto &&spectrumBands = stft.spectrum[c];
for (int b = 0; b < stft.bands(); ++b) { for (int b = 0; b < stft.bands(); ++b) {
bands[b].input = spectrumBands[b]*rotCentreSpectrum[b]; bands[b].input = signalsmith::perf::mul(spectrumBands[b], rotCentreSpectrum[b]);
} }
} }
@ -156,7 +161,7 @@ struct SignalsmithStretch {
auto bands = bandsForChannel(c); auto bands = bandsForChannel(c);
auto &&spectrumBands = stft.spectrum[c]; auto &&spectrumBands = stft.spectrum[c];
for (int b = 0; b < stft.bands(); ++b) { for (int b = 0; b < stft.bands(); ++b) {
spectrumBands[b] = bands[b].output*std::conj(rotCentreSpectrum[b]); spectrumBands[b] = signalsmith::perf::mul<true>(bands[b].output, rotCentreSpectrum[b]);
} }
} }
}); });
@ -165,9 +170,6 @@ struct SignalsmithStretch {
auto &&outputChannel = outputs[c]; auto &&outputChannel = outputs[c];
auto &&stftChannel = stft[c]; auto &&stftChannel = stft[c];
outputChannel[outputIndex] = stftChannel[outputIndex]; outputChannel[outputIndex] = stftChannel[outputIndex];
// Debug:
outputChannel[outputIndex] *= -1;
} }
} }
@ -220,6 +222,7 @@ private:
std::vector<Sample> timeBuffer; std::vector<Sample> timeBuffer;
std::vector<Complex> rotCentreSpectrum, rotPrevOutput, rotPrevInput; std::vector<Complex> rotCentreSpectrum, rotPrevOutput, rotPrevInput;
int rotPrevInputShift = -1;
Sample bandToFreq(int b) const { Sample bandToFreq(int b) const {
return (b + Sample(0.5))/stft.fftSize(); return (b + Sample(0.5))/stft.fftSize();
} }
@ -316,8 +319,8 @@ private:
auto bins = bandsForChannel(c); auto bins = bandsForChannel(c);
for (int b = 0; b < stft.bands(); ++b) { for (int b = 0; b < stft.bands(); ++b) {
auto &bin = bins[b]; auto &bin = bins[b];
bin.prevOutput *= rotPrevOutput[b]; bin.prevOutput = signalsmith::perf::mul(bin.prevOutput, rotPrevOutput[b]);
bin.prevInput *= rotPrevInput[b]; bin.prevInput = signalsmith::perf::mul(bin.prevInput, rotPrevInput[b]);
} }
} }
} }
@ -345,15 +348,15 @@ private:
prediction.input = getFractional<&Band::input>(c, lowIndex, fracIndex); prediction.input = getFractional<&Band::input>(c, lowIndex, fracIndex);
Complex prevInput = getFractional<&Band::prevInput>(c, lowIndex, fracIndex); Complex prevInput = getFractional<&Band::prevInput>(c, lowIndex, fracIndex);
Complex freqTwist = prediction.input*std::conj(prevInput); Complex freqTwist = signalsmith::perf::mul<true>(prediction.input, prevInput);
prediction.freqPrediction = outputBin.prevOutput*freqTwist; prediction.freqPrediction = signalsmith::perf::mul(outputBin.prevOutput, freqTwist);
if (b > 0) { if (b > 0) {
Complex downInput = getFractional<&Band::input>(c, mapPoint.inputBin - rate); Complex downInput = getFractional<&Band::input>(c, mapPoint.inputBin - rate);
prediction.shortVerticalTwist = prediction.input*std::conj(downInput); prediction.shortVerticalTwist = signalsmith::perf::mul<true>(prediction.input, downInput);
if (b > longVerticalStep) { if (b > longVerticalStep) {
Complex longDownInput = getFractional<&Band::input>(c, mapPoint.inputBin - longVerticalStep*rate); Complex longDownInput = getFractional<&Band::input>(c, mapPoint.inputBin - longVerticalStep*rate);
prediction.longVerticalTwist = prediction.input*std::conj(longDownInput); prediction.longVerticalTwist = signalsmith::perf::mul<true>(prediction.input, longDownInput);
} else { } else {
prediction.longVerticalTwist = 0; prediction.longVerticalTwist = 0;
} }
@ -390,22 +393,22 @@ private:
// Short steps // Short steps
if (b > 0) { if (b > 0) {
auto &otherBin = bins[b - 1]; auto &otherBin = bins[b - 1];
phase += otherBin.output*prediction.shortVerticalTwist; phase += signalsmith::perf::mul(otherBin.output, prediction.shortVerticalTwist);
} }
if (b < stft.bands() - 1) { if (b < stft.bands() - 1) {
auto &otherBin = bins[b + 1]; auto &otherBin = bins[b + 1];
auto &otherPrediction = predictions[b + 1]; auto &otherPrediction = predictions[b + 1];
phase += otherBin.output*std::conj(otherPrediction.shortVerticalTwist); phase += signalsmith::perf::mul<true>(otherBin.output, otherPrediction.shortVerticalTwist);
} }
// longer verticals // longer verticals
if (b > longVerticalStep) { if (b > longVerticalStep) {
auto &otherBin = bins[b - longVerticalStep]; auto &otherBin = bins[b - longVerticalStep];
phase += otherBin.output*prediction.longVerticalTwist; phase += signalsmith::perf::mul(otherBin.output, prediction.longVerticalTwist);
} }
if (b < stft.bands() - longVerticalStep) { if (b < stft.bands() - longVerticalStep) {
auto &otherBin = bins[b + longVerticalStep]; auto &otherBin = bins[b + longVerticalStep];
auto &otherPrediction = predictions[b + longVerticalStep]; auto &otherPrediction = predictions[b + longVerticalStep];
phase += otherBin.output*std::conj(otherPrediction.longVerticalTwist); phase += signalsmith::perf::mul<true>(otherBin.output, otherPrediction.longVerticalTwist);
} }
Sample phaseNorm = std::norm(phase); Sample phaseNorm = std::norm(phase);
@ -421,8 +424,8 @@ private:
auto &channelBin = bandsForChannel(c)[b]; auto &channelBin = bandsForChannel(c)[b];
auto &channelPrediction = predictionsForChannel(c)[b]; auto &channelPrediction = predictionsForChannel(c)[b];
Complex channelTwist = channelPrediction.input*std::conj(prediction.input); Complex channelTwist = signalsmith::perf::mul<true>(channelPrediction.input, prediction.input);
Complex channelPhase = outputBin.output*channelTwist; Complex channelPhase = signalsmith::perf::mul(outputBin.output, channelTwist);
Sample channelPhaseNorm = std::norm(channelPhase); Sample channelPhaseNorm = std::norm(channelPhase);
if (channelPhaseNorm > noiseFloor) { if (channelPhaseNorm > noiseFloor) {