Merge pull request #9895 from zzmp/clean/noise-gate

Strip AudioNoiseGate of dead code

libraries/audio-client/src/AudioClient.h

@@ -45,13 +45,13 @@
 #include <AudioReverb.h>
 #include <AudioLimiter.h>
 #include <AudioConstants.h>
+#include <AudioNoiseGate.h>
 
 #include <shared/RateCounter.h>
 
 #include <plugins/CodecPlugin.h>
 
 #include "AudioIOStats.h"
-#include "AudioNoiseGate.h"
 
 #ifdef _WIN32
 #pragma warning( push )

libraries/audio/src/AudioNoiseGate.cpp

@@ -1,6 +1,6 @@
 //
 //  AudioNoiseGate.cpp
-//  interface/src/audio
+//  libraries/audio
 //
 //  Created by Stephen Birarda on 2014-12-16.
 //  Copyright 2014 High Fidelity, Inc.
@@ -9,29 +9,23 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "AudioNoiseGate.h"
+
 #include <cstdlib>
 #include <string.h>
 
-#include <AudioConstants.h>
-
-#include "AudioNoiseGate.h"
+#include "AudioConstants.h"
 
 const float AudioNoiseGate::CLIPPING_THRESHOLD = 0.90f;
 
 AudioNoiseGate::AudioNoiseGate() :
-    _inputBlockCounter(0),
     _lastLoudness(0.0f),
-    _quietestBlock(std::numeric_limits<float>::max()),
-    _loudestBlock(0.0f),
     _didClipInLastBlock(false),
     _dcOffset(0.0f),
     _measuredFloor(0.0f),
     _sampleCounter(0),
     _isOpen(false),
-    _blocksToClose(0)
-{
-    
-}
+    _blocksToClose(0) {}
 
 void AudioNoiseGate::removeDCOffset(int16_t* samples, int numSamples) {
     //
@@ -104,20 +98,6 @@ void AudioNoiseGate::gateSamples(int16_t* samples, int numSamples) {
 
     _lastLoudness = fabs(loudness / numSamples);
 
-    if (_quietestBlock > _lastLoudness) {
-        _quietestBlock = _lastLoudness;
-    }
-    if (_loudestBlock < _lastLoudness) {
-        _loudestBlock = _lastLoudness;
-    }
-    
-    const int FRAMES_FOR_NOISE_DETECTION = 400;
-    if (_inputBlockCounter++ > FRAMES_FOR_NOISE_DETECTION) {
-        _quietestBlock = std::numeric_limits<float>::max();
-        _loudestBlock = 0.0f;
-        _inputBlockCounter = 0;
-    }
-    
     //  If Noise Gate is enabled, check and turn the gate on and off
     float averageOfAllSampleBlocks = 0.0f;
     _sampleBlocks[_sampleCounter++] = _lastLoudness;

libraries/audio/src/AudioNoiseGate.h

@@ -1,6 +1,6 @@
 //
 //  AudioNoiseGate.h
-//  interface/src/audio
+//  libraries/audio
 //
 //  Created by Stephen Birarda on 2014-12-16.
 //  Copyright 2014 High Fidelity, Inc.
@@ -33,10 +33,7 @@ public:
     static const float CLIPPING_THRESHOLD;
 
 private:
-    int _inputBlockCounter;
     float _lastLoudness;
-    float _quietestBlock;
-    float _loudestBlock;
     bool _didClipInLastBlock;
     float _dcOffset;
     float _measuredFloor;