Skip to content

Commit

Permalink
Fix manual ducking
Browse files Browse the repository at this point in the history
now the ducking gain is only applied when talkover is enabled
  • Loading branch information
daschuer committed May 6, 2020
1 parent f287a31 commit 27a585e
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 16 deletions.
18 changes: 14 additions & 4 deletions src/engine/enginemaster.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -464,11 +464,21 @@ void EngineMaster::process(const int iBufferSize) {
m_pTalkover,
m_iBufferSize, m_iSampleRate, busFeatures);


// Clear talkover compressor for the next round of gain calculation.
m_pTalkoverDucking->clearKeys();
if (m_pTalkoverDucking->getMode() != EngineTalkoverDucking::OFF) {
switch (m_pTalkoverDucking->getMode()) {
case EngineTalkoverDucking::OFF:
m_pTalkoverDucking->setAboveThreshold(false);
break;
case EngineTalkoverDucking::AUTO:
m_pTalkoverDucking->processKey(m_pTalkover, m_iBufferSize);
break;
case EngineTalkoverDucking::MANUAL:
qDebug() << "m_activeTalkoverChannels.size()" << m_activeTalkoverChannels.size();
m_pTalkoverDucking->setAboveThreshold(m_activeTalkoverChannels.size());
break;
default:
DEBUG_ASSERT("!Unknown Ducking mode");
m_pTalkoverDucking->setAboveThreshold(false);
break;
}

// Calculate the crossfader gains for left and right side of the crossfader
Expand Down
5 changes: 3 additions & 2 deletions src/engine/enginesidechaincompressor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,12 @@ void EngineSideChainCompressor::calculateRates() {
<< "decay per frame: " << m_decayPerFrame;
}

void EngineSideChainCompressor::clearKeys() {
m_bAboveThreshold = false;
void EngineSideChainCompressor::setAboveThreshold(bool value) {
m_bAboveThreshold = value;
}

void EngineSideChainCompressor::processKey(const CSAMPLE* pIn, const int iBufferSize) {
m_bAboveThreshold = false;
for (int i = 0; i + 1 < iBufferSize; i += 2) {
CSAMPLE val = (pIn[i] + pIn[i + 1]) / 2;
if (val > m_threshold) {
Expand Down
6 changes: 2 additions & 4 deletions src/engine/enginesidechaincompressor.h
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,8 @@ class EngineSideChainCompressor {
calculateRates();
}


// Before calling processKey on multiple channels, first call clearKeys to
// clear state from the last round of compressor gain calculation.
void clearKeys();
/// Forces the above threshold flag to the given value without calculations
void setAboveThreshold(bool value);

// Every loop, before calling process, first call processKey to feed
// the compressor the input key signal. It is safe to call this function
Expand Down
12 changes: 6 additions & 6 deletions src/engine/enginetalkoverducking.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -67,13 +67,13 @@ void EngineTalkoverDucking::slotDuckModeChanged(double mode) {
CSAMPLE EngineTalkoverDucking::getGain(int numFrames) {
// Apply microphone ducking.
switch (getMode()) {
case EngineTalkoverDucking::OFF:
case EngineTalkoverDucking::OFF:
return 1.0;
case EngineTalkoverDucking::AUTO:
case EngineTalkoverDucking::AUTO:
case EngineTalkoverDucking::MANUAL:
return calculateCompressedGain(numFrames);
case EngineTalkoverDucking::MANUAL:
return m_pDuckStrength->get();
default:
DEBUG_ASSERT("!Unknown Ducking mode");
return 1.0;
}
qWarning() << "Invalid ducking mode, returning 1.0";
return 1.0;
}

0 comments on commit 27a585e

Please sign in to comment.