Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-16 05:48:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Integrate new noise gate

Browse source
This commit is contained in:
Ken Cooke 2017-05-23 11:12:36 -07:00
parent 986d86ec17
commit 850dbd76c9
1 changed files with 37 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
libraries/audio-client/src/AudioClient.cpp
View file

@ -1008,28 +1008,47 @@ void AudioClient::handleAudioInput(QByteArray& audioBuffer) {
} else { } else {
int16_t* samples = reinterpret_cast<int16_t*>(audioBuffer.data()); int16_t* samples = reinterpret_cast<int16_t*>(audioBuffer.data());
int numSamples = audioBuffer.size() / AudioConstants::SAMPLE_SIZE; int numSamples = audioBuffer.size() / AudioConstants::SAMPLE_SIZE;
bool didClip = false; int numFrames = numSamples / (_isStereoInput ? AudioConstants::STEREO : AudioConstants::MONO);
bool shouldRemoveDCOffset = !_isPlayingBackRecording && !_isStereoInput; //bool didClip = false;
if (shouldRemoveDCOffset) {
_noiseGate.removeDCOffset(samples, numSamples); //bool shouldRemoveDCOffset = !_isPlayingBackRecording && !_isStereoInput;
//if (shouldRemoveDCOffset) {
// _noiseGate.removeDCOffset(samples, numSamples);
//}
//bool shouldNoiseGate = (_isPlayingBackRecording || !_isStereoInput) && _isNoiseGateEnabled;
//if (shouldNoiseGate) {
// _noiseGate.gateSamples(samples, numSamples);
// _lastInputLoudness = _noiseGate.getLastLoudness();
// didClip = _noiseGate.clippedInLastBlock();
//} else {
// float loudness = 0.0f;
// for (int i = 0; i < numSamples; ++i) {
// int16_t sample = std::abs(samples[i]);
// loudness += (float)sample;
// didClip = didClip ||
// (sample > (AudioConstants::MAX_SAMPLE_VALUE * AudioNoiseGate::CLIPPING_THRESHOLD));
// }
// _lastInputLoudness = fabs(loudness / numSamples);
//}
if (_isNoiseGateEnabled) {
// The audio gate includes DC removal
_audioGate->render(samples, samples, numFrames);
} else {
_audioGate->removeDC(samples, samples, numFrames);
} }
bool shouldNoiseGate = (_isPlayingBackRecording || !_isStereoInput) && _isNoiseGateEnabled; // TODO: optimize this
if (shouldNoiseGate) {
_noiseGate.gateSamples(samples, numSamples);
_lastInputLoudness = _noiseGate.getLastLoudness();
didClip = _noiseGate.clippedInLastBlock();
} else {
float loudness = 0.0f; float loudness = 0.0f;
bool didClip = false;
for (int i = 0; i < numSamples; ++i) { for (int i = 0; i < numSamples; ++i) {
int16_t sample = std::abs(samples[i]); int16_t sample = std::abs(samples[i]);
loudness += (float)sample; loudness += (float)sample;
didClip = didClip || didClip = didClip || (sample > (AudioConstants::MAX_SAMPLE_VALUE * AudioNoiseGate::CLIPPING_THRESHOLD));
(sample > (AudioConstants::MAX_SAMPLE_VALUE * AudioNoiseGate::CLIPPING_THRESHOLD));
} }
_lastInputLoudness = fabs(loudness / numSamples); _lastInputLoudness = fabs(loudness / numSamples);
}
if (didClip) { if (didClip) {
_timeSinceLastClip = 0.0f; _timeSinceLastClip = 0.0f;