Commit 467a62fd authored by Alexandre Savard's avatar Alexandre Savard
Browse files

[#3487] Used filtered data to feed echo canceller ...

parent cfe4d928
...@@ -323,7 +323,7 @@ void EchoCancel::performEchoCancel(SFLDataFormat *micData, SFLDataFormat *spkrDa ...@@ -323,7 +323,7 @@ void EchoCancel::performEchoCancel(SFLDataFormat *micData, SFLDataFormat *spkrDa
updateEchoCancel(micData+(k*_smplPerSeg), spkrData+(k*_smplPerSeg)); updateEchoCancel(micData+(k*_smplPerSeg), spkrData+(k*_smplPerSeg));
_spkrLevel = getMaxAmplitude(_avgSpkrLevelHist, _spkrHistoryLength); _spkrLevel = getMaxAmplitude(_avgSpkrLevelHist, _spkrHistoryLength);
_micLevel = getMaxAmplitude(_avgMicLevelHist, _micHistoryLength)/2; _micLevel = getMaxAmplitude(_avgMicLevelHist, _micHistoryLength)/6;
// _debug("_spkrLevel: (max): %d", _spkrLevel); // _debug("_spkrLevel: (max): %d", _spkrLevel);
// _debug("_micLevel: (min): %d", _micLevel); // _debug("_micLevel: (min): %d", _micLevel);
......
...@@ -987,7 +987,7 @@ void PulseLayer::readFromMic (void) ...@@ -987,7 +987,7 @@ void PulseLayer::readFromMic (void)
_audiofilter->processAudio((SFLDataFormat *)data, filter_out, r); _audiofilter->processAudio((SFLDataFormat *)data, filter_out, r);
// echo cancellation processing // echo cancellation processing
int sampleready = _echoCanceller->processAudio((SFLDataFormat *)data, echoCancelledMic, r); int sampleready = _echoCanceller->processAudio((SFLDataFormat *)filter_out, echoCancelledMic, r);
// no resampling required // no resampling required
getMainBuffer()->putData (echoCancelledMic, sampleready*sizeof (SFLDataFormat), 100); getMainBuffer()->putData (echoCancelledMic, sampleready*sizeof (SFLDataFormat), 100);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment