[#3341] Wrap noise suppression engine in am audio process algorithm class

sflphone-common/src/audio/Makefile.am

@@ -21,6 +21,7 @@ libaudio_la_SOURCES = \
 		delaydetection.cpp \
 		echocancel.cpp \
 		speexechocancel.cpp \
+		noisesuppress.cpp \
 		audioprocessing.cpp \
 		dcblocker.cpp \
 		jitterbuf.cpp \
@@ -40,6 +41,7 @@ noinst_HEADERS = \
 		delaydetection.h \
 		echocancel.h \
 		speexechocancel.h \
+		noisesuppress.h \
 		audioprocessing.h \
 		dcblocker.h \
 		jitterbuf.h \

sflphone-common/src/audio/noisesuppress.cpp

+/*
+ *  Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
+ *  Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ *  Additional permission under GNU GPL version 3 section 7:
+ *
+ *  If you modify this program, or any covered work, by linking or
+ *  combining it with the OpenSSL project's OpenSSL library (or a
+ *  modified version of that library), containing parts covered by the
+ *  terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ *  grants you additional permission to convey the resulting work.
+ *  Corresponding Source for a non-source form of such a combination
+ *  shall include the source code for the parts of OpenSSL used as well
+ *  as that of the covered work.
+ */
+
+#include "noisesuppress.h"
+
+NoiseSuppress::NoiseSuppress (int smplPerFrame, int samplingRate) : _noiseState (NULL)
+        , _smplPerFrame (smplPerFrame)
+        , _samplingRate (samplingRate)
+{
+    initNewNoiseSuppressor (_smplPerFrame, _samplingRate);
+}
+
+
+NoiseSuppress::~NoiseSuppress()
+{
+    speex_preprocess_state_destroy (_noiseState);
+}
+
+void NoiseSuppress::reset (void)
+{
+
+    speex_preprocess_state_destroy (_noiseState);
+
+    initNewNoiseSuppressor (_smplPerFrame, _samplingRate);
+}
+
+void NoiseSuppress::putData (SFLDataFormat *inputData, int nbBytes) {}
+
+int NoiseSuppress::getData (SFLDataFormat *outputData) {}
+
+void NoiseSuppress::process (SFLDataFormat *data, int nbBytes)
+{
+    if (_noiseState)
+        speex_preprocess_run (_noiseState, data);
+}
+
+int NoiseSuppress::process (SFLDataFormat *inputData, SFLDataFormat *outputData, int nbBytes) {}
+
+void NoiseSuppress::process (SFLDataFormat *micData, SFLDataFormat *spkrData, SFLDataFormat *outputData, int nbBytes) {}
+
+void NoiseSuppress::initNewNoiseSuppressor (int smplPerFrame, int samplingRate)
+{
+    _noiseState = speex_preprocess_state_init (smplPerFrame, samplingRate);
+    int i=1;
+    speex_preprocess_ctl (_noiseState, SPEEX_PREPROCESS_SET_DENOISE, &i);
+    i=-20;
+    speex_preprocess_ctl (_noiseState, SPEEX_PREPROCESS_SET_NOISE_SUPPRESS, &i);
+    i=0;
+    speex_preprocess_ctl (_noiseState, SPEEX_PREPROCESS_SET_AGC, &i);
+    i=8000;
+    speex_preprocess_ctl (_noiseState, SPEEX_PREPROCESS_SET_AGC_TARGET, &i);
+    i=16000;
+    speex_preprocess_ctl (_noiseState, SPEEX_PREPROCESS_SET_AGC_LEVEL, &i);
+    i=0;
+    speex_preprocess_ctl (_noiseState, SPEEX_PREPROCESS_SET_DEREVERB, &i);
+    float f=0.0;
+    speex_preprocess_ctl (_noiseState, SPEEX_PREPROCESS_SET_DEREVERB_DECAY, &f);
+    f=0.0;
+    speex_preprocess_ctl (_noiseState, SPEEX_PREPROCESS_SET_DEREVERB_LEVEL, &f);
+    i = 0;
+    speex_preprocess_ctl (_noiseState, SPEEX_PREPROCESS_SET_VAD, &i);
+}

sflphone-common/src/audio/noisesuppress.h

+/*
+ *  Copyright (C) 2004, 2005, 2006, 2009, 2008, 2009, 2010 Savoir-Faire Linux Inc.
+ *  Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ *  Additional permission under GNU GPL version 3 section 7:
+ *
+ *  If you modify this program, or any covered work, by linking or
+ *  combining it with the OpenSSL project's OpenSSL library (or a
+ *  modified version of that library), containing parts covered by the
+ *  terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ *  grants you additional permission to convey the resulting work.
+ *  Corresponding Source for a non-source form of such a combination
+ *  shall include the source code for the parts of OpenSSL used as well
+ *  as that of the covered work.
+ */
+
+#ifndef NOISESUPPRESS_H
+#define NOISESUPPRESS_H
+
+#include <speex/speex_preprocess.h>
+#include "algorithm.h"
+#include "audioprocessing.h"
+
+
+class NoiseSuppress : public Algorithm
+{
+
+    public:
+
+        NoiseSuppress (int smplPerFrame, int samplingRate);
+
+        ~NoiseSuppress (void);
+
+        /**
+             * Reset noise suppressor internal state at runtime. Usefull when making a new call
+             */
+        virtual void reset (void);
+
+        /**
+         * Unused
+        */
+        virtual void putData (SFLDataFormat *inputData, int nbBytes);
+
+        /**
+        * Unused
+         */
+        virtual int getData (SFLDataFormat *outputData);
+
+        /**
+         * Unused
+         */
+        virtual void process (SFLDataFormat *data, int nbBytes);
+
+        /**
+         * Unused
+        */
+        virtual int process (SFLDataFormat *inputData, SFLDataFormat *outputData, int nbBytes);
+
+        /**
+        * Unused
+         */
+        virtual void process (SFLDataFormat *micData, SFLDataFormat *spkrData, SFLDataFormat *outputData, int nbBytes);
+
+    private:
+
+        void initNewNoiseSuppressor (int _smplPerFrame, int samplingRate);
+
+        /**
+             * Noise reduction processing state
+             */
+        SpeexPreprocessState *_noiseState;
+
+        int _smplPerFrame;
+
+        int _samplingRate;
+
+};
+
+#endif