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

Merge from branch midside3

Browse Source
This commit is contained in:
Chris Cannam
2023-03-20 10:08:20 +00:00
parent 2dcb27d3dd e2611485d8
commit 5f93a90902
3 changed files with 56 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/finer/R3Stretcher.cpp
View File

@@ -757,11 +757,13 @@ R3Stretcher::process(const float *const *input, size_t samples, bool final)
int maxResampleInput = int(floor(maxResampleOutput * m_pitchScale));
int resampleInput = std::min(remaining, maxResampleInput);
if (resampleInput == 0) resampleInput = 1;
prepareInput(input, inputIx, resampleInput);
int resampleOutput = m_resampler->resample
(m_channelAssembly.resampled.data(),
maxResampleOutput,
input,
m_channelAssembly.input.data(),
resampleInput,
1.0 / m_pitchScale,
final);
@@ -781,8 +783,11 @@ R3Stretcher::process(const float *const *input, size_t samples, bool final)
m_log.log(2, "process: resamplingBefore is false, writing to inbuf from supplied data, former read space and samples being added", m_channelData[0]->inbuf->getReadSpace(), toWrite);
prepareInput(input, inputIx, toWrite);
for (int c = 0; c < m_parameters.channels; ++c) {
m_channelData[c]->inbuf->write(input[c] + inputIx, toWrite);
m_channelData[c]->inbuf->write
(m_channelAssembly.input[c], toWrite);
}
inputIx += toWrite;
}
@@ -819,9 +824,43 @@ R3Stretcher::retrieve(float *const *output, size_t samples) const
}
}
if (useMidSide()) {
for (int i = 0; i < got; ++i) {
float m = output[0][i];
float s = output[1][i];
float l = m + s;
float r = m - s;
output[0][i] = l;
output[1][i] = r;
}
}
return got;
}
void
R3Stretcher::prepareInput(const float *const *input, int ix, int n)
{
if (useMidSide()) {
auto &c0 = m_channelData.at(0)->mixdown;
auto &c1 = m_channelData.at(1)->mixdown;
for (int i = 0; i < n; ++i) {
float l = input[0][i + ix];
float r = input[1][i + ix];
float m = (l + r) / 2.f;
float s = (l - r) / 2.f;
c0[i] = m;
c1[i] = s;
}
m_channelAssembly.input[0] = m_channelData.at(0)->mixdown.data();
m_channelAssembly.input[1] = m_channelData.at(1)->mixdown.data();
} else {
for (int c = 0; c < m_parameters.channels; ++c) {
m_channelAssembly.input[c] = input[c] + ix;
}
}
}
void
R3Stretcher::consume()
{
@@ -933,6 +972,7 @@ R3Stretcher::consume()
m_channelAssembly.prevMag.data(),
m_guideConfiguration,
m_channelAssembly.guidance.data(),
useMidSide(),
m_prevInhop,
m_prevOuthop);
}