Use mid-side processing in channels-together mode in R3; for a more stable stereo image, ensure transient bins are reset in mid whenever they are in side

This commit is contained in:
Chris Cannam
2023-03-17 13:19:18 +00:00
parent d3830870c0
commit e2611485d8
3 changed files with 13 additions and 6 deletions

View File

@@ -819,9 +819,7 @@ R3Stretcher::retrieve(float *const *output, size_t samples) const
}
}
bool useMidSide = (m_parameters.channels == 2); //!!!
if (useMidSide) {
if (useMidSide()) {
for (int i = 0; i < got; ++i) {
float m = output[0][i];
float s = output[1][i];
@@ -838,9 +836,7 @@ R3Stretcher::retrieve(float *const *output, size_t samples) const
void
R3Stretcher::prepareInput(const float *const *input, int ix, int n)
{
bool useMidSide = (m_parameters.channels == 2); //!!!
if (useMidSide) {
if (useMidSide()) {
auto &c0 = m_channelData.at(0)->mixdown;
auto &c1 = m_channelData.at(1)->mixdown;
for (int i = 0; i < n; ++i) {
@@ -971,6 +967,7 @@ R3Stretcher::consume()
m_channelAssembly.prevMag.data(),
m_guideConfiguration,
m_channelAssembly.guidance.data(),
useMidSide(),
m_prevInhop,
m_prevOuthop);
}