From a78c30abfb5c393363fcab6df83151916e58327a Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Mon, 27 Jan 2020 16:34:57 +0100 Subject: [PATCH 01/25] Test gain set to -3/+3 --- ambed/main.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ambed/main.h b/ambed/main.h index 931badc..bcfb1f7 100644 --- a/ambed/main.h +++ b/ambed/main.h @@ -68,8 +68,8 @@ #define CODEC_AMBE2PLUS 2 // Transcoding speech gains -#define CODECGAIN_AMBEPLUS -10 // in dB -#define CODECGAIN_AMBE2PLUS +10 // in dB +#define CODECGAIN_AMBEPLUS -3//-10 // in dB +#define CODECGAIN_AMBE2PLUS +3//+10 // in dB // Timeouts ----------------------------------------------------- #define STREAM_ACTIVITY_TIMEOUT 3 // in seconds From 64f5fddf17bdaabc5eebabc48066f10ad029f3f7 Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Tue, 28 Jan 2020 21:06:43 +0100 Subject: [PATCH 02/25] Add AGC --- ambed/cagc.cpp | 82 +++++++++++++++++++++++++++++++++++++ ambed/cagc.h | 56 +++++++++++++++++++++++++ ambed/cusb3xxxinterface.cpp | 5 ++- ambed/cvocodecchannel.cpp | 2 +- ambed/cvocodecchannel.h | 4 ++ 5 files changed, 147 insertions(+), 2 deletions(-) create mode 100644 ambed/cagc.cpp create mode 100644 ambed/cagc.h diff --git a/ambed/cagc.cpp b/ambed/cagc.cpp new file mode 100644 index 0000000..721d69f --- /dev/null +++ b/ambed/cagc.cpp @@ -0,0 +1,82 @@ +// +// cagc.cpp +// ambed +// +// Created by Jean-Luc Deltombe (LX3JL) on 28/04/2017. +// Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved. +// +// ---------------------------------------------------------------------------- +// This file is part of ambed. +// +// xlxd 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. +// +// xlxd 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 Foobar. If not, see . +// ---------------------------------------------------------------------------- +// Geoffrey Merck F4FXL / KC3FRA AGC code borrowed from Liquid DSP +// Only took the parts we need qnd recoeded it to be close the XLX coding style +// https://github.com/jgaeddert/liquid-dsp/blob/master/src/agc/src/agc.c + +#include "main.h" +#include +#include "cagc.h" + + +//////////////////////////////////////////////////////////////////////////////////////// +// constructor + +CAGC::CAGC(float initialLeveldB) +{ + // set internal gain appropriately + m_g = powf(10.0f, -initialLeveldB/20.0f); + + // ensure resulting gain is not arbitrarily low + if (m_g < 1e-16f) + m_g = 1e-16f; + + m_scale = 1.0f; + m_bandwidth = 1e-2f; + m_y2_prime = 1.0f; +} + +void CAGC::Apply(uint8 * voice, int size) +{ + for (int i = 0; i < size; i+=2) + { + //Get the sample + float _x = (float)(short)MAKEWORD(voice[i+1], voice[i]); + + //apply AGC + // apply gain to input sample + float _y = _x * m_g; + + // compute output signal energy + float y2 = _y * _y; + + // smooth energy estimate using single-pole low-pass filter + m_y2_prime = (1.0f - m_alpha) * m_y2_prime + m_alpha*y2; + + // update gain according to output energy + if (m_y2_prime > 1e-6f) + m_g *= exp( -0.5f * m_alpha * log(m_y2_prime) ); + + // clamp to 120 dB gain + if (m_g > 1e6f) + m_g = 1e6f; + + // apply output scale + _y *= m_scale; + + //write processed sample back to it + voice[i] = HIBYTE((short)_y); + voice[i+1] = LOBYTE((short)_y); + } +} \ No newline at end of file diff --git a/ambed/cagc.h b/ambed/cagc.h new file mode 100644 index 0000000..20f7800 --- /dev/null +++ b/ambed/cagc.h @@ -0,0 +1,56 @@ +// +// cagc.h +// ambed +// +// Created by Jean-Luc Deltombe (LX3JL) on 26/04/2017. +// Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved. +// +// ---------------------------------------------------------------------------- +// This file is part of ambed. +// +// xlxd 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. +// +// xlxd 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 Foobar. If not, see . +// ---------------------------------------------------------------------------- +// Geoffrey Merck F4FXL / KC3FRA AGC code borrowed from Liquid DSP +// Only took the parts we need qnd recoeded it to be close the XLX coding style +// https://github.com/jgaeddert/liquid-dsp/blob/master/src/agc/src/agc.c + +#ifndef cagc_h +#define cagc_h + +#include "main.h" + +class CAGC +{ +public: + //Constructor + CAGC(float initialLeveldB); + + //methods + void Apply(uint8 * voice, int size); + float GetGain(){ return m_scale; }//gets current gain (linear) + +private: + // gain variables + float m_g; // current gain value + float m_scale; // output scale value + + // gain control loop filter parameters + float m_bandwidth; // bandwidth-time constant + float m_alpha; // feed-back gain + + // signal level estimate + float m_y2_prime; // filtered output signal energy estimate +}; + +#endif /* cgc_h */ \ No newline at end of file diff --git a/ambed/cusb3xxxinterface.cpp b/ambed/cusb3xxxinterface.cpp index c8eb461..732fe4a 100644 --- a/ambed/cusb3xxxinterface.cpp +++ b/ambed/cusb3xxxinterface.cpp @@ -152,7 +152,10 @@ void CUsb3xxxInterface::Task(void) { Queue = Channel->GetVoiceQueue(); CVoicePacket *clone = new CVoicePacket(VoicePacket); - clone->ApplyGain(Channel->GetSpeechGain()); + CAGC agc = Channel->GetAGC(); + agc.Apply(clone->GetVoice(), clone->GetVoiceSize()); + std::cout << "Gain : " << agc.GetGain(); + //clone->ApplyGain(Channel->GetSpeechGain()); Queue->push(clone); Channel->ReleaseVoiceQueue(); } diff --git a/ambed/cvocodecchannel.cpp b/ambed/cvocodecchannel.cpp index 0212424..04a252c 100644 --- a/ambed/cvocodecchannel.cpp +++ b/ambed/cvocodecchannel.cpp @@ -27,11 +27,11 @@ #include "cvocodecchannel.h" #include "cvocodecinterface.h" - //////////////////////////////////////////////////////////////////////////////////////// // constructor CVocodecChannel::CVocodecChannel(CVocodecInterface *InterfaceIn, int iChIn, CVocodecInterface *InterfaceOut, int iChOut, int iSpeechGain) +: m_AGC((float)iSpeechGain) { m_bOpen = false; m_InterfaceIn = InterfaceIn; diff --git a/ambed/cvocodecchannel.h b/ambed/cvocodecchannel.h index 4848c87..c0983a9 100644 --- a/ambed/cvocodecchannel.h +++ b/ambed/cvocodecchannel.h @@ -27,6 +27,7 @@ #define cvocodecchannel_h #include "cpacketqueue.h" +#include "cagc.h" //////////////////////////////////////////////////////////////////////////////////////// // class @@ -53,6 +54,7 @@ public: int GetChannelIn(void) const { return m_iChannelIn; } int GetChannelOut(void) const { return m_iChannelOut; } int GetSpeechGain(void) const { return m_iSpeechGain; } + CAGC& GetAGC() { return m_AGC; }; // interfaces bool IsInterfaceIn(const CVocodecInterface *interface) { return (interface == m_InterfaceIn); } @@ -92,6 +94,8 @@ protected: // settings int m_iSpeechGain; +private: + CAGC m_AGC; }; //////////////////////////////////////////////////////////////////////////////////////// From 658a47bc4eb010a4f5d437d4d8249511cc869806 Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Tue, 28 Jan 2020 21:44:51 +0100 Subject: [PATCH 03/25] Avoid Exxposing a reference to the internal AGC, improve debug info --- ambed/cagc.h | 6 +++--- ambed/cusb3xxxinterface.cpp | 4 +--- ambed/cvocodecchannel.cpp | 6 ++++++ ambed/cvocodecchannel.h | 5 ++++- 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/ambed/cagc.h b/ambed/cagc.h index 20f7800..b549197 100644 --- a/ambed/cagc.h +++ b/ambed/cagc.h @@ -29,6 +29,7 @@ #define cagc_h #include "main.h" +#include "math.h" class CAGC { @@ -38,10 +39,9 @@ public: //methods void Apply(uint8 * voice, int size); - float GetGain(){ return m_scale; }//gets current gain (linear) - + float GetGain(){ return -20.0f*log10(m_g); }//gets current gain + private: - // gain variables float m_g; // current gain value float m_scale; // output scale value diff --git a/ambed/cusb3xxxinterface.cpp b/ambed/cusb3xxxinterface.cpp index 732fe4a..210b01f 100644 --- a/ambed/cusb3xxxinterface.cpp +++ b/ambed/cusb3xxxinterface.cpp @@ -152,9 +152,7 @@ void CUsb3xxxInterface::Task(void) { Queue = Channel->GetVoiceQueue(); CVoicePacket *clone = new CVoicePacket(VoicePacket); - CAGC agc = Channel->GetAGC(); - agc.Apply(clone->GetVoice(), clone->GetVoiceSize()); - std::cout << "Gain : " << agc.GetGain(); + Channel->ApplyAGC(*clone); //clone->ApplyGain(Channel->GetSpeechGain()); Queue->push(clone); Channel->ReleaseVoiceQueue(); diff --git a/ambed/cvocodecchannel.cpp b/ambed/cvocodecchannel.cpp index 04a252c..42c3bf8 100644 --- a/ambed/cvocodecchannel.cpp +++ b/ambed/cvocodecchannel.cpp @@ -92,6 +92,12 @@ uint8 CVocodecChannel::GetCodecOut(void) const return m_InterfaceOut->GetChannelCodec(m_iChannelOut); } +void CVocodecChannel::ApplyAGC(CVoicePacket& voicePacket) +{ + m_AGC.Apply(voicePacket.GetVoice(), voicePacket.GetVoiceSize()); + std::cout << "Gain : " << m_AGC.GetGain() << "\n"; +} + //////////////////////////////////////////////////////////////////////////////////////// // queues helpers diff --git a/ambed/cvocodecchannel.h b/ambed/cvocodecchannel.h index c0983a9..58fdfe5 100644 --- a/ambed/cvocodecchannel.h +++ b/ambed/cvocodecchannel.h @@ -28,6 +28,7 @@ #include "cpacketqueue.h" #include "cagc.h" +#include "cvoicepacket.h" //////////////////////////////////////////////////////////////////////////////////////// // class @@ -54,7 +55,9 @@ public: int GetChannelIn(void) const { return m_iChannelIn; } int GetChannelOut(void) const { return m_iChannelOut; } int GetSpeechGain(void) const { return m_iSpeechGain; } - CAGC& GetAGC() { return m_AGC; }; + + //Processing + void ApplyAGC(CVoicePacket& voicePacket); // interfaces bool IsInterfaceIn(const CVocodecInterface *interface) { return (interface == m_InterfaceIn); } From 53384f036c14cbb817148a87154f655124205a48 Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Wed, 29 Jan 2020 17:30:22 +0100 Subject: [PATCH 04/25] Clamp Gain, Scale input sample Add gain clamping +-dB Scale input Sample --- ambed/cagc.cpp | 31 +++++++++++++++++++++++-------- ambed/cagc.h | 8 ++++---- 2 files changed, 27 insertions(+), 12 deletions(-) diff --git a/ambed/cagc.cpp b/ambed/cagc.cpp index 721d69f..71dd28d 100644 --- a/ambed/cagc.cpp +++ b/ambed/cagc.cpp @@ -36,17 +36,25 @@ CAGC::CAGC(float initialLeveldB) { // set internal gain appropriately - m_g = powf(10.0f, -initialLeveldB/20.0f); + m_g = pow(10.0f, initialLeveldB/20.0f); // ensure resulting gain is not arbitrarily low if (m_g < 1e-16f) m_g = 1e-16f; - m_scale = 1.0f; - m_bandwidth = 1e-2f; + m_scale = (float)0xFFFF; + m_bandwidth = 1e-2f; //TODO : Move to parameter ? + m_gMax = pow(10.0f, initialLeveldB + 10.0f/20.0f);//+- 10dB Margin, TODO Move margin to constant + m_gMin = pow(10.0f, initialLeveldB - 10.0f/20.0f); + m_alpha = m_bandwidth; m_y2_prime = 1.0f; } +float CAGC::GetGain() +{ + return 20.0f*log10(m_g); +} + void CAGC::Apply(uint8 * voice, int size) { for (int i = 0; i < size; i+=2) @@ -54,6 +62,11 @@ void CAGC::Apply(uint8 * voice, int size) //Get the sample float _x = (float)(short)MAKEWORD(voice[i+1], voice[i]); + //This AGC tries to smooth energy so it does not exceed 1 + //Therefore divide by our max supposed value + //Maybe we could also change y2 prime calculation below, but for now stick with this + _x /= m_scale; + //apply AGC // apply gain to input sample float _y = _x * m_g; @@ -66,16 +79,18 @@ void CAGC::Apply(uint8 * voice, int size) // update gain according to output energy if (m_y2_prime > 1e-6f) - m_g *= exp( -0.5f * m_alpha * log(m_y2_prime) ); + m_g *= exp( -0.5f * m_alpha * log(m_y2_prime) ); - // clamp to 120 dB gain - if (m_g > 1e6f) - m_g = 1e6f; + // clamp gain + if (m_g > m_gMax) + m_g = m_gMax; + else if(m_g < m_gMin) + m_g = m_gMin; // apply output scale _y *= m_scale; - //write processed sample back to it + //write processed sample back voice[i] = HIBYTE((short)_y); voice[i+1] = LOBYTE((short)_y); } diff --git a/ambed/cagc.h b/ambed/cagc.h index b549197..ad8aa6e 100644 --- a/ambed/cagc.h +++ b/ambed/cagc.h @@ -21,7 +21,7 @@ // You should have received a copy of the GNU General Public License // along with Foobar. If not, see . // ---------------------------------------------------------------------------- -// Geoffrey Merck F4FXL / KC3FRA AGC code borrowed from Liquid DSP +// Geoffrey Merck F4FXL / KC3FRA AGC code largely inspired by Liquid DSP // Only took the parts we need qnd recoeded it to be close the XLX coding style // https://github.com/jgaeddert/liquid-dsp/blob/master/src/agc/src/agc.c @@ -29,7 +29,6 @@ #define cagc_h #include "main.h" -#include "math.h" class CAGC { @@ -39,11 +38,12 @@ public: //methods void Apply(uint8 * voice, int size); - float GetGain(){ return -20.0f*log10(m_g); }//gets current gain + float GetGain();//gets current gain private: float m_g; // current gain value - float m_scale; // output scale value + float m_gMax, m_gMin; //gain clamping + float m_scale; // scale value // gain control loop filter parameters float m_bandwidth; // bandwidth-time constant From 7ffc58daaa650bd5742656f1bafe038d9cc343f7 Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Wed, 29 Jan 2020 18:12:26 +0100 Subject: [PATCH 05/25] Well, forgot some basic maths .... --- ambed/cagc.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ambed/cagc.cpp b/ambed/cagc.cpp index 71dd28d..d388442 100644 --- a/ambed/cagc.cpp +++ b/ambed/cagc.cpp @@ -44,8 +44,8 @@ CAGC::CAGC(float initialLeveldB) m_scale = (float)0xFFFF; m_bandwidth = 1e-2f; //TODO : Move to parameter ? - m_gMax = pow(10.0f, initialLeveldB + 10.0f/20.0f);//+- 10dB Margin, TODO Move margin to constant - m_gMin = pow(10.0f, initialLeveldB - 10.0f/20.0f); + m_gMax = pow(10.0f, (initialLeveldB + 10.0f)/20.0f);//+- 10dB Margin, TODO Move margin to constant + m_gMin = pow(10.0f, (initialLeveldB - 10.0f)/20.0f); m_alpha = m_bandwidth; m_y2_prime = 1.0f; } From 0a06b267485f591cb8bc2069dac4447f21507bfd Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Wed, 29 Jan 2020 19:37:35 +0100 Subject: [PATCH 06/25] Apply Scale to energy, value still needs to be tweaked --- ambed/cagc.cpp | 12 ++---------- ambed/cagc.h | 2 +- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/ambed/cagc.cpp b/ambed/cagc.cpp index d388442..477bd7f 100644 --- a/ambed/cagc.cpp +++ b/ambed/cagc.cpp @@ -42,7 +42,7 @@ CAGC::CAGC(float initialLeveldB) if (m_g < 1e-16f) m_g = 1e-16f; - m_scale = (float)0xFFFF; + m_scale = 32768.0f; m_bandwidth = 1e-2f; //TODO : Move to parameter ? m_gMax = pow(10.0f, (initialLeveldB + 10.0f)/20.0f);//+- 10dB Margin, TODO Move margin to constant m_gMin = pow(10.0f, (initialLeveldB - 10.0f)/20.0f); @@ -62,17 +62,12 @@ void CAGC::Apply(uint8 * voice, int size) //Get the sample float _x = (float)(short)MAKEWORD(voice[i+1], voice[i]); - //This AGC tries to smooth energy so it does not exceed 1 - //Therefore divide by our max supposed value - //Maybe we could also change y2 prime calculation below, but for now stick with this - _x /= m_scale; - //apply AGC // apply gain to input sample float _y = _x * m_g; // compute output signal energy - float y2 = _y * _y; + float y2 = (_y * _y) / m_scale; // smooth energy estimate using single-pole low-pass filter m_y2_prime = (1.0f - m_alpha) * m_y2_prime + m_alpha*y2; @@ -87,9 +82,6 @@ void CAGC::Apply(uint8 * voice, int size) else if(m_g < m_gMin) m_g = m_gMin; - // apply output scale - _y *= m_scale; - //write processed sample back voice[i] = HIBYTE((short)_y); voice[i+1] = LOBYTE((short)_y); diff --git a/ambed/cagc.h b/ambed/cagc.h index ad8aa6e..080d665 100644 --- a/ambed/cagc.h +++ b/ambed/cagc.h @@ -43,7 +43,7 @@ public: private: float m_g; // current gain value float m_gMax, m_gMin; //gain clamping - float m_scale; // scale value + float m_scale; // scale value for target energy // gain control loop filter parameters float m_bandwidth; // bandwidth-time constant From fe700f253b43ca3c8aa4da9df477ba14a53c9625 Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Wed, 29 Jan 2020 19:57:12 +0100 Subject: [PATCH 07/25] Clean up and better names for variables --- ambed/cagc.cpp | 46 ++++++++++++++++++++++------------------------ ambed/cagc.h | 12 ++++++------ 2 files changed, 28 insertions(+), 30 deletions(-) diff --git a/ambed/cagc.cpp b/ambed/cagc.cpp index 477bd7f..3ac73c4 100644 --- a/ambed/cagc.cpp +++ b/ambed/cagc.cpp @@ -36,23 +36,21 @@ CAGC::CAGC(float initialLeveldB) { // set internal gain appropriately - m_g = pow(10.0f, initialLeveldB/20.0f); + m_Gain = pow(10.0f, initialLeveldB/20.0f); + //+- 10dB Margin, TODO Move margin to constant + m_GainMax = pow(10.0f, (initialLeveldB + 10.0f)/20.0f); + m_GainMin = pow(10.0f, (initialLeveldB - 10.0f)/20.0f); + + m_EnergyPrime = 1.0f; + m_targetEnergy = 32768.0f;//TODO : Move to parameter ? - // ensure resulting gain is not arbitrarily low - if (m_g < 1e-16f) - m_g = 1e-16f; - - m_scale = 32768.0f; - m_bandwidth = 1e-2f; //TODO : Move to parameter ? - m_gMax = pow(10.0f, (initialLeveldB + 10.0f)/20.0f);//+- 10dB Margin, TODO Move margin to constant - m_gMin = pow(10.0f, (initialLeveldB - 10.0f)/20.0f); - m_alpha = m_bandwidth; - m_y2_prime = 1.0f; + m_Bandwidth = 1e-2f;//TODO : Move to parameter ? + m_Alpha = m_Bandwidth; } float CAGC::GetGain() { - return 20.0f*log10(m_g); + return 20.0f*log10(m_Gain); } void CAGC::Apply(uint8 * voice, int size) @@ -60,30 +58,30 @@ void CAGC::Apply(uint8 * voice, int size) for (int i = 0; i < size; i+=2) { //Get the sample - float _x = (float)(short)MAKEWORD(voice[i+1], voice[i]); + float input = (float)(short)MAKEWORD(voice[i+1], voice[i]); //apply AGC // apply gain to input sample - float _y = _x * m_g; + float output = input * m_Gain; // compute output signal energy - float y2 = (_y * _y) / m_scale; + float instantEnergy = (output * output) / m_targetEnergy; // smooth energy estimate using single-pole low-pass filter - m_y2_prime = (1.0f - m_alpha) * m_y2_prime + m_alpha*y2; + m_EnergyPrime = (1.0f - m_Alpha) * m_EnergyPrime + m_Alpha * instantEnergy; // update gain according to output energy - if (m_y2_prime > 1e-6f) - m_g *= exp( -0.5f * m_alpha * log(m_y2_prime) ); + if (m_EnergyPrime > 1e-6f) + m_Gain *= exp( -0.5f * m_Alpha * log(m_EnergyPrime) ); // clamp gain - if (m_g > m_gMax) - m_g = m_gMax; - else if(m_g < m_gMin) - m_g = m_gMin; + if (m_Gain > m_GainMax) + m_Gain = m_GainMax; + else if(m_Gain < m_GainMin) + m_Gain = m_GainMin; //write processed sample back - voice[i] = HIBYTE((short)_y); - voice[i+1] = LOBYTE((short)_y); + voice[i] = HIBYTE((short)output); + voice[i+1] = LOBYTE((short)output); } } \ No newline at end of file diff --git a/ambed/cagc.h b/ambed/cagc.h index 080d665..c3b1831 100644 --- a/ambed/cagc.h +++ b/ambed/cagc.h @@ -41,16 +41,16 @@ public: float GetGain();//gets current gain private: - float m_g; // current gain value - float m_gMax, m_gMin; //gain clamping - float m_scale; // scale value for target energy + float m_Gain; // current gain value + float m_GainMax, m_GainMin; //gain clamping + float m_targetEnergy; // scale value for target energy // gain control loop filter parameters - float m_bandwidth; // bandwidth-time constant - float m_alpha; // feed-back gain + float m_Bandwidth; // bandwidth-time constant + float m_Alpha; // feed-back gain // signal level estimate - float m_y2_prime; // filtered output signal energy estimate + float m_EnergyPrime; // filtered output signal energy estimate }; #endif /* cgc_h */ \ No newline at end of file From f01c44ed532756e0fedc11bb285413700e67fe19 Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Wed, 29 Jan 2020 20:02:03 +0100 Subject: [PATCH 08/25] Add comments --- ambed/cagc.cpp | 6 ++++++ ambed/cagc.h | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ambed/cagc.cpp b/ambed/cagc.cpp index 3ac73c4..619a59f 100644 --- a/ambed/cagc.cpp +++ b/ambed/cagc.cpp @@ -48,11 +48,17 @@ CAGC::CAGC(float initialLeveldB) m_Alpha = m_Bandwidth; } +//////////////////////////////////////////////////////////////////////////////////////// +// get + float CAGC::GetGain() { return 20.0f*log10(m_Gain); } +//////////////////////////////////////////////////////////////////////////////////////// +// process + void CAGC::Apply(uint8 * voice, int size) { for (int i = 0; i < size; i+=2) diff --git a/ambed/cagc.h b/ambed/cagc.h index c3b1831..c1547e3 100644 --- a/ambed/cagc.h +++ b/ambed/cagc.h @@ -23,7 +23,7 @@ // ---------------------------------------------------------------------------- // Geoffrey Merck F4FXL / KC3FRA AGC code largely inspired by Liquid DSP // Only took the parts we need qnd recoeded it to be close the XLX coding style -// https://github.com/jgaeddert/liquid-dsp/blob/master/src/agc/src/agc.c +// https://github.com/jgaeddert/liquid-dsp/blob/master/src/agc/src/agc.c #ifndef cagc_h #define cagc_h From 66eab222c42fa1ab3285a20ad25223a7678f6b88 Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Wed, 29 Jan 2020 20:08:20 +0100 Subject: [PATCH 09/25] Remove debug information ouput --- ambed/cvocodecchannel.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ambed/cvocodecchannel.cpp b/ambed/cvocodecchannel.cpp index 42c3bf8..382c04d 100644 --- a/ambed/cvocodecchannel.cpp +++ b/ambed/cvocodecchannel.cpp @@ -95,7 +95,7 @@ uint8 CVocodecChannel::GetCodecOut(void) const void CVocodecChannel::ApplyAGC(CVoicePacket& voicePacket) { m_AGC.Apply(voicePacket.GetVoice(), voicePacket.GetVoiceSize()); - std::cout << "Gain : " << m_AGC.GetGain() << "\n"; + //std::cout << "Gain : " << m_AGC.GetGain() << "\n"; } //////////////////////////////////////////////////////////////////////////////////////// From 3c06fb0ac12a1bc143b658d9fe6df32e6279963c Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Mon, 3 Feb 2020 15:34:08 +0100 Subject: [PATCH 10/25] Do not square energy as we are not complex. Do not clamp gain --- ambed/cagc.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ambed/cagc.cpp b/ambed/cagc.cpp index 619a59f..7cf5e2e 100644 --- a/ambed/cagc.cpp +++ b/ambed/cagc.cpp @@ -42,7 +42,7 @@ CAGC::CAGC(float initialLeveldB) m_GainMin = pow(10.0f, (initialLeveldB - 10.0f)/20.0f); m_EnergyPrime = 1.0f; - m_targetEnergy = 32768.0f;//TODO : Move to parameter ? + m_targetEnergy = 32767.0f;//TODO : Move to parameter ? m_Bandwidth = 1e-2f;//TODO : Move to parameter ? m_Alpha = m_Bandwidth; @@ -70,8 +70,8 @@ void CAGC::Apply(uint8 * voice, int size) // apply gain to input sample float output = input * m_Gain; - // compute output signal energy - float instantEnergy = (output * output) / m_targetEnergy; + // compute output signal energy, scaled to 0 to 1 + float instantEnergy = abs(output) / m_targetEnergy; // smooth energy estimate using single-pole low-pass filter m_EnergyPrime = (1.0f - m_Alpha) * m_EnergyPrime + m_Alpha * instantEnergy; @@ -81,10 +81,10 @@ void CAGC::Apply(uint8 * voice, int size) m_Gain *= exp( -0.5f * m_Alpha * log(m_EnergyPrime) ); // clamp gain - if (m_Gain > m_GainMax) + /*if (m_Gain > m_GainMax) m_Gain = m_GainMax; else if(m_Gain < m_GainMin) - m_Gain = m_GainMin; + m_Gain = m_GainMin;*/ //write processed sample back voice[i] = HIBYTE((short)output); From f936d8ffeb9b2ac1606792b0ee9aa8ad7ce67631 Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Mon, 3 Feb 2020 20:10:40 +0100 Subject: [PATCH 11/25] Reenable gain clamping --- ambed/cagc.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ambed/cagc.cpp b/ambed/cagc.cpp index 7cf5e2e..55294db 100644 --- a/ambed/cagc.cpp +++ b/ambed/cagc.cpp @@ -81,10 +81,10 @@ void CAGC::Apply(uint8 * voice, int size) m_Gain *= exp( -0.5f * m_Alpha * log(m_EnergyPrime) ); // clamp gain - /*if (m_Gain > m_GainMax) + if (m_Gain > m_GainMax) m_Gain = m_GainMax; else if(m_Gain < m_GainMin) - m_Gain = m_GainMin;*/ + m_Gain = m_GainMin; //write processed sample back voice[i] = HIBYTE((short)output); From de961853c7d1724515261232684e72600b711408 Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Mon, 3 Feb 2020 20:52:14 +0100 Subject: [PATCH 12/25] Add Filtering and defines Add FIR passband Filtering Add defines to swithc features on and off --- ambed/cfirfilter.cpp | 74 +++++++++++++++++++++++++++++++++++++ ambed/cfirfilter.h | 52 ++++++++++++++++++++++++++ ambed/cusb3xxxinterface.cpp | 9 ++++- ambed/cvocodecchannel.cpp | 24 +++++++++++- ambed/cvocodecchannel.h | 17 ++++++++- ambed/main.h | 44 +++++++++++++++++++++- 6 files changed, 214 insertions(+), 6 deletions(-) create mode 100644 ambed/cfirfilter.cpp create mode 100644 ambed/cfirfilter.h diff --git a/ambed/cfirfilter.cpp b/ambed/cfirfilter.cpp new file mode 100644 index 0000000..602e01c --- /dev/null +++ b/ambed/cfirfilter.cpp @@ -0,0 +1,74 @@ +// +// cfirfilter.cpp +// ambed +// +// Created by Jean-Luc Deltombe (LX3JL) on 26/04/2017. +// Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved. +// +// ---------------------------------------------------------------------------- +// This file is part of ambed. +// +// xlxd 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. +// +// xlxd 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 Foobar. If not, see . +// ---------------------------------------------------------------------------- +// FIRFilter by Geoffrey Merck F4FXL / KC3FRA + +#include "cfirfilter.h" +#include + +CFIRFilter::CFIRFilter(const float* taps, int tapsLength) +{ + m_taps = new float[tapsLength]; + m_buffer = new float[tapsLength]; + + ::memcpy(m_taps, taps, tapsLength * sizeof(float)); + ::memset(m_buffer, 0, tapsLength * sizeof(float)); + m_currentBufferPostion = 0; +} + +CFIRFilter::~CFIRFilter() +{ + delete[] m_taps; + delete[] m_buffer; +} + +inline float CFIRFilter::Process(float inputSample) +{ + // Buffer latest sample + m_buffer[m_currentBufferPostion] = inputSample; + + float outputSample = 0.0f; + for(int i = 0; i < m_tapsLength; i++) + { + outputSample += m_taps[i] * m_buffer[(m_currentBufferPostion + i) % m_tapsLength]; + } + + m_currentBufferPostion = (m_currentBufferPostion + 1) % m_tapsLength; + + return outputSample; +} + +void CFIRFilter::Process(uint8* voice, int length) +{ + for(int i = 0; i < length; i++) + { + //Get the sample + float input = (float)(short)MAKEWORD(voice[i+1], voice[i]); + + float output = Process(input); + + //write processed sample back + voice[i] = HIBYTE((short)output); + voice[i+1] = LOBYTE((short)output); + } +} diff --git a/ambed/cfirfilter.h b/ambed/cfirfilter.h new file mode 100644 index 0000000..aa1dafd --- /dev/null +++ b/ambed/cfirfilter.h @@ -0,0 +1,52 @@ +// +// cfirfilter.h +// ambed +// +// Created by Jean-Luc Deltombe (LX3JL) on 26/04/2017. +// Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved. +// +// ---------------------------------------------------------------------------- +// This file is part of ambed. +// +// xlxd 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. +// +// xlxd 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 Foobar. If not, see . +// ---------------------------------------------------------------------------- +// FIRFilter by Geoffrey Merck F4FXL / KC3FRA + +#ifndef cfirfilter_h +#define cfirfilter_h + +#include "main.h" + +class CFIRFilter +{ +public : + //Constructor + CFIRFilter(const float* taps, int tapsLength); + + // Destructor + ~CFIRFilter(); + + // Processing + float Process(float inputSample); + void Process(uint8* voice, int length); + +private: + float* m_taps; + int m_tapsLength; + float* m_buffer; + int m_currentBufferPostion; +}; + +#endif //cfirfilter_h + diff --git a/ambed/cusb3xxxinterface.cpp b/ambed/cusb3xxxinterface.cpp index 210b01f..49c1269 100644 --- a/ambed/cusb3xxxinterface.cpp +++ b/ambed/cusb3xxxinterface.cpp @@ -152,8 +152,15 @@ void CUsb3xxxInterface::Task(void) { Queue = Channel->GetVoiceQueue(); CVoicePacket *clone = new CVoicePacket(VoicePacket); +#if USE_BANDPASSFILTER + //Aply band pass before AGC to avoidd amplifying signals we do not want + Channel->ApplyFilter(*clone); +#endif +#if USE_AGC == 1 Channel->ApplyAGC(*clone); - //clone->ApplyGain(Channel->GetSpeechGain()); +#else + clone->ApplyGain(Channel->GetSpeechGain()); +#endif Queue->push(clone); Channel->ReleaseVoiceQueue(); } diff --git a/ambed/cvocodecchannel.cpp b/ambed/cvocodecchannel.cpp index 382c04d..8ce57f8 100644 --- a/ambed/cvocodecchannel.cpp +++ b/ambed/cvocodecchannel.cpp @@ -31,7 +31,6 @@ // constructor CVocodecChannel::CVocodecChannel(CVocodecInterface *InterfaceIn, int iChIn, CVocodecInterface *InterfaceOut, int iChOut, int iSpeechGain) -: m_AGC((float)iSpeechGain) { m_bOpen = false; m_InterfaceIn = InterfaceIn; @@ -39,6 +38,12 @@ CVocodecChannel::CVocodecChannel(CVocodecInterface *InterfaceIn, int iChIn, CVoc m_InterfaceOut = InterfaceOut; m_iChannelOut = iChOut; m_iSpeechGain = iSpeechGain; +#if USE_AGC == 1 + m_AGC = new CAGC((float)iSpeechGain); +#endif +#if USE_BANDPASSFILTER == 1 + m_filter = new CFIRFilter(FILTER_TAPS, FILTER_TAPS_LENGTH); +#endif } //////////////////////////////////////////////////////////////////////////////////////// @@ -47,6 +52,12 @@ CVocodecChannel::CVocodecChannel(CVocodecInterface *InterfaceIn, int iChIn, CVoc CVocodecChannel::~CVocodecChannel() { PurgeAllQueues(); +#if USE_AGC == 1 + delete m_AGC; +#endif +#if USE_BANDPASSFILTER == 1 + delete m_filter; +#endif } //////////////////////////////////////////////////////////////////////////////////////// @@ -92,11 +103,20 @@ uint8 CVocodecChannel::GetCodecOut(void) const return m_InterfaceOut->GetChannelCodec(m_iChannelOut); } +#if USE_AGC == 1 void CVocodecChannel::ApplyAGC(CVoicePacket& voicePacket) { - m_AGC.Apply(voicePacket.GetVoice(), voicePacket.GetVoiceSize()); + m_AGC->Apply(voicePacket.GetVoice(), voicePacket.GetVoiceSize()); //std::cout << "Gain : " << m_AGC.GetGain() << "\n"; } +#endif + +#if USE_BANDPASSFILTER == 1 +void CVocodecChannel::ApplyFilter(CVoicePacket& voicePacket) +{ + m_filter->Process(voicePacket.GetVoice(), voicePacket.GetVoiceSize()); +} +#endif //////////////////////////////////////////////////////////////////////////////////////// // queues helpers diff --git a/ambed/cvocodecchannel.h b/ambed/cvocodecchannel.h index 58fdfe5..735fa00 100644 --- a/ambed/cvocodecchannel.h +++ b/ambed/cvocodecchannel.h @@ -27,7 +27,12 @@ #define cvocodecchannel_h #include "cpacketqueue.h" +#if USE_AGC == 1 #include "cagc.h" +#endif +#if USE_BANDPASSFILTER == 1 +#include "cfirfilter.h" +#endif #include "cvoicepacket.h" //////////////////////////////////////////////////////////////////////////////////////// @@ -57,7 +62,12 @@ public: int GetSpeechGain(void) const { return m_iSpeechGain; } //Processing +#if USE_AGC == 1 void ApplyAGC(CVoicePacket& voicePacket); +#endif +#if USE_BANDPASSFILTER + void ApplyFilter(CVoicePacket& voicePacket); +#endif // interfaces bool IsInterfaceIn(const CVocodecInterface *interface) { return (interface == m_InterfaceIn); } @@ -98,7 +108,12 @@ protected: int m_iSpeechGain; private: - CAGC m_AGC; +#if USE_AGC == 1 + CAGC* m_AGC; +#endif +#if USE_BANDPASSFILTER == 1 + CFIRFilter* m_filter; +#endif }; //////////////////////////////////////////////////////////////////////////////////////// diff --git a/ambed/main.h b/ambed/main.h index bcfb1f7..ef60a2b 100644 --- a/ambed/main.h +++ b/ambed/main.h @@ -68,8 +68,12 @@ #define CODEC_AMBE2PLUS 2 // Transcoding speech gains -#define CODECGAIN_AMBEPLUS -3//-10 // in dB -#define CODECGAIN_AMBE2PLUS +3//+10 // in dB +#define CODECGAIN_AMBEPLUS -10 // in dB +#define CODECGAIN_AMBE2PLUS +10 // in dB + +// Transcoding Tweaks +#define USE_AGC 0 +#define USE_BANDPASSFILTER 1 // Timeouts ----------------------------------------------------- #define STREAM_ACTIVITY_TIMEOUT 3 // in seconds @@ -96,6 +100,42 @@ typedef unsigned int uint; #define LOWORD(dw) ((uint16)(uint32)(dw & 0x0000FFFF)) #define HIWORD(dw) ((uint16)((((uint32)(dw)) >> 16) & 0xFFFF)) +//////////////////////////////////////////////////////////////////////////////////////// +// FIR Filter coefficients computed to be the closest to the recommended filter in +// Documentation +// +// Following GNU Octave script was used +/* +pkg load signal; +fsamp = 8000; +fcuts = [200 300 3000 3400]; +mags = [0 1 0]; +devs = [0.2 1 0.2]; + +[n,Wn,beta,ftype] = kaiserord(fcuts,mags,devs,fsamp); +n = n + rem(n,2); +hh = fir1(n,Wn,ftype,kaiser(n+1,beta),'noscale'); + +freqz(hh); +[H,f] = freqz(hh,1,1024,fsamp); +plot(f,abs(H)) +disp(hh); +grid +*/ + +#if USE_BANDPASSFILTER == 1 + +const float FILTER_TAPS[] { +-0.0153779f, 0.0114832f, -0.0060703f, -0.0221526f, 0.0085472f, -0.0449400f, +-0.0068112f, -0.0307485f, -0.0548559f, -0.0022596f, -0.0879344f, -0.0166698f, +-0.0533627f, -0.1015552f, 0.0424673f, -0.2116654f, 0.1267453f, 0.7375000f, +0.1267453f, -0.2116654f, 0.0424673f, -0.1015552f, -0.0533627f, -0.0166698f, +-0.0879344f, -0.0022596f, -0.0548559f, -0.0307485f, -0.0068112f, -0.0449400f, +0.0085472f, -0.0221526f, -0.0060703f, 0.0114832f, -0.0153779f }; +#define FILTER_TAPS_LENGTH 35 + +#endif + //////////////////////////////////////////////////////////////////////////////////////// // global objects From adbea50027abc582fba713b2290509c42f7471c5 Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Mon, 3 Feb 2020 21:26:41 +0100 Subject: [PATCH 13/25] It is always better to initialize variables --- ambed/cfirfilter.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/ambed/cfirfilter.cpp b/ambed/cfirfilter.cpp index 602e01c..f002440 100644 --- a/ambed/cfirfilter.cpp +++ b/ambed/cfirfilter.cpp @@ -30,6 +30,7 @@ CFIRFilter::CFIRFilter(const float* taps, int tapsLength) { m_taps = new float[tapsLength]; m_buffer = new float[tapsLength]; + m_tapsLength = tapsLength; ::memcpy(m_taps, taps, tapsLength * sizeof(float)); ::memset(m_buffer, 0, tapsLength * sizeof(float)); From 4ba6a77ecc3558a8950d6c42dc3f46bfabdf48c5 Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Mon, 3 Feb 2020 22:23:10 +0100 Subject: [PATCH 14/25] Improve circular buffer --- ambed/cfirfilter.cpp | 8 ++++---- ambed/cfirfilter.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ambed/cfirfilter.cpp b/ambed/cfirfilter.cpp index f002440..9f93db8 100644 --- a/ambed/cfirfilter.cpp +++ b/ambed/cfirfilter.cpp @@ -34,7 +34,7 @@ CFIRFilter::CFIRFilter(const float* taps, int tapsLength) ::memcpy(m_taps, taps, tapsLength * sizeof(float)); ::memset(m_buffer, 0, tapsLength * sizeof(float)); - m_currentBufferPostion = 0; + m_currentBufferPosition = m_tapsLength -1; } CFIRFilter::~CFIRFilter() @@ -46,15 +46,15 @@ CFIRFilter::~CFIRFilter() inline float CFIRFilter::Process(float inputSample) { // Buffer latest sample - m_buffer[m_currentBufferPostion] = inputSample; + m_buffer[m_currentBufferPosition] = inputSample; float outputSample = 0.0f; for(int i = 0; i < m_tapsLength; i++) { - outputSample += m_taps[i] * m_buffer[(m_currentBufferPostion + i) % m_tapsLength]; + outputSample += m_taps[i] * m_buffer[(m_currentBufferPosition + i) % m_tapsLength]; } - m_currentBufferPostion = (m_currentBufferPostion + 1) % m_tapsLength; + m_currentBufferPosition = MAX(0, m_currentBufferPosition - 1); return outputSample; } diff --git a/ambed/cfirfilter.h b/ambed/cfirfilter.h index aa1dafd..9d1d9c4 100644 --- a/ambed/cfirfilter.h +++ b/ambed/cfirfilter.h @@ -45,7 +45,7 @@ private: float* m_taps; int m_tapsLength; float* m_buffer; - int m_currentBufferPostion; + int m_currentBufferPosition; }; #endif //cfirfilter_h From ee1b97a1654e76c548bb3b16a3033c909a7f6309 Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Tue, 4 Feb 2020 22:21:57 +0100 Subject: [PATCH 15/25] Better FIR Filter implementation, correct sample collecting --- ambed/cfirfilter.cpp | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/ambed/cfirfilter.cpp b/ambed/cfirfilter.cpp index 9f93db8..920ffe3 100644 --- a/ambed/cfirfilter.cpp +++ b/ambed/cfirfilter.cpp @@ -34,7 +34,7 @@ CFIRFilter::CFIRFilter(const float* taps, int tapsLength) ::memcpy(m_taps, taps, tapsLength * sizeof(float)); ::memset(m_buffer, 0, tapsLength * sizeof(float)); - m_currentBufferPosition = m_tapsLength -1; + m_currentBufferPosition = 0; } CFIRFilter::~CFIRFilter() @@ -45,23 +45,30 @@ CFIRFilter::~CFIRFilter() inline float CFIRFilter::Process(float inputSample) { - // Buffer latest sample + float output = 0.0f; + int iTaps = 0; + + // Buffer latest sample into delay line m_buffer[m_currentBufferPosition] = inputSample; - float outputSample = 0.0f; - for(int i = 0; i < m_tapsLength; i++) + for(int i = m_currentBufferPosition; i >= 0; i--) { - outputSample += m_taps[i] * m_buffer[(m_currentBufferPosition + i) % m_tapsLength]; + output += m_taps[iTaps++] * m_buffer[i]; } - m_currentBufferPosition = MAX(0, m_currentBufferPosition - 1); + for(int i = m_tapsLength - 1; i > m_currentBufferPosition; i--) + { + output += m_taps[iTaps++] * m_buffer[i]; + } + + m_currentBufferPosition = (m_currentBufferPosition + 1) % m_tapsLength; - return outputSample; + return output; } void CFIRFilter::Process(uint8* voice, int length) { - for(int i = 0; i < length; i++) + for(int i = 0; i < length; i+=2) { //Get the sample float input = (float)(short)MAKEWORD(voice[i+1], voice[i]); From b9d0c6e532b277e11438b5ffe4ebac60f9162850 Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Tue, 4 Feb 2020 22:23:06 +0100 Subject: [PATCH 16/25] Add AGC clamping constant, turn AGC on, reduce target energy --- ambed/cagc.cpp | 8 +++++--- ambed/main.h | 7 ++++--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/ambed/cagc.cpp b/ambed/cagc.cpp index 55294db..d5cd58c 100644 --- a/ambed/cagc.cpp +++ b/ambed/cagc.cpp @@ -38,11 +38,13 @@ CAGC::CAGC(float initialLeveldB) // set internal gain appropriately m_Gain = pow(10.0f, initialLeveldB/20.0f); //+- 10dB Margin, TODO Move margin to constant - m_GainMax = pow(10.0f, (initialLeveldB + 10.0f)/20.0f); - m_GainMin = pow(10.0f, (initialLeveldB - 10.0f)/20.0f); + m_GainMax = pow(10.0f, (initialLeveldB + AGC_CLAMPING)/20.0f); + m_GainMin = pow(10.0f, (initialLeveldB - AGC_CLAMPING)/20.0f); m_EnergyPrime = 1.0f; - m_targetEnergy = 32767.0f;//TODO : Move to parameter ? + + // We do not target full scale to avoid stauration + m_targetEnergy = 32767.0f/2.0f;//TODO : Move to parameter ? m_Bandwidth = 1e-2f;//TODO : Move to parameter ? m_Alpha = m_Bandwidth; diff --git a/ambed/main.h b/ambed/main.h index ef60a2b..c66b70c 100644 --- a/ambed/main.h +++ b/ambed/main.h @@ -68,11 +68,12 @@ #define CODEC_AMBE2PLUS 2 // Transcoding speech gains -#define CODECGAIN_AMBEPLUS -10 // in dB -#define CODECGAIN_AMBE2PLUS +10 // in dB +#define CODECGAIN_AMBEPLUS -16 // in dB +#define CODECGAIN_AMBE2PLUS +16 // in dB // Transcoding Tweaks -#define USE_AGC 0 +#define USE_AGC 1 +#define AGC_CLAMPING 3 //clamps the AGC gain to +- this value #define USE_BANDPASSFILTER 1 // Timeouts ----------------------------------------------------- From c44aac0f84ac7e03e8b72cc9543109fcd735b621 Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Wed, 12 Feb 2020 20:59:11 +0100 Subject: [PATCH 17/25] Default AGC off, restore gains --- ambed/main.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ambed/main.h b/ambed/main.h index c66b70c..62fe65b 100644 --- a/ambed/main.h +++ b/ambed/main.h @@ -68,11 +68,11 @@ #define CODEC_AMBE2PLUS 2 // Transcoding speech gains -#define CODECGAIN_AMBEPLUS -16 // in dB -#define CODECGAIN_AMBE2PLUS +16 // in dB +#define CODECGAIN_AMBEPLUS -10 // in dB +#define CODECGAIN_AMBE2PLUS +10 // in dB // Transcoding Tweaks -#define USE_AGC 1 +#define USE_AGC 0 #define AGC_CLAMPING 3 //clamps the AGC gain to +- this value #define USE_BANDPASSFILTER 1 From 10c796f192ec9e4c9ec01594f2eda93c55c284d9 Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Thu, 13 Feb 2020 20:34:51 +0100 Subject: [PATCH 18/25] Make AGC 25dB below saturation --- ambed/cagc.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ambed/cagc.cpp b/ambed/cagc.cpp index d5cd58c..d5b2105 100644 --- a/ambed/cagc.cpp +++ b/ambed/cagc.cpp @@ -44,8 +44,10 @@ CAGC::CAGC(float initialLeveldB) m_EnergyPrime = 1.0f; // We do not target full scale to avoid stauration - m_targetEnergy = 32767.0f/2.0f;//TODO : Move to parameter ? + m_targetEnergy = 32767.0f * pow(10.0f, (initialLeveldB - 25.0)/20.0f);//25 dB below saturation as stated in docs + //we also substract our target gain + //this is the time constant of our AGC... m_Bandwidth = 1e-2f;//TODO : Move to parameter ? m_Alpha = m_Bandwidth; } From 02a583f0b3c9cdecb920bac12e01ae6ce85ec014 Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Sat, 22 Feb 2020 06:10:55 +0100 Subject: [PATCH 19/25] Reduce processing delay Process one packet all at once --- ambed/cagc.cpp | 47 ++++++++------------ ambed/cagc.h | 6 +-- ambed/cfirfilter.cpp | 15 +------ ambed/cfirfilter.h | 5 +-- ambed/cfixedgain.cpp | 44 ++++++++++++++++++ ambed/cfixedgain.h | 45 +++++++++++++++++++ ambed/csampleprocessor.h | 36 +++++++++++++++ ambed/csignalprocessor.cpp | 89 +++++++++++++++++++++++++++++++++++++ ambed/csignalprocessor.h | 48 ++++++++++++++++++++ ambed/cusb3xxxinterface.cpp | 10 +---- ambed/cvocodecchannel.cpp | 30 +++---------- ambed/cvocodecchannel.h | 21 ++------- ambed/cvoicepacket.cpp | 15 ------- ambed/cvoicepacket.h | 3 -- 14 files changed, 298 insertions(+), 116 deletions(-) create mode 100644 ambed/cfixedgain.cpp create mode 100644 ambed/cfixedgain.h create mode 100644 ambed/csampleprocessor.h create mode 100644 ambed/csignalprocessor.cpp create mode 100644 ambed/csignalprocessor.h diff --git a/ambed/cagc.cpp b/ambed/cagc.cpp index d5b2105..23ef6e4 100644 --- a/ambed/cagc.cpp +++ b/ambed/cagc.cpp @@ -25,10 +25,9 @@ // Only took the parts we need qnd recoeded it to be close the XLX coding style // https://github.com/jgaeddert/liquid-dsp/blob/master/src/agc/src/agc.c -#include "main.h" #include #include "cagc.h" - +#include "main.h" //////////////////////////////////////////////////////////////////////////////////////// // constructor @@ -63,35 +62,27 @@ float CAGC::GetGain() //////////////////////////////////////////////////////////////////////////////////////// // process -void CAGC::Apply(uint8 * voice, int size) +inline float CAGC::ProcessSample(float input) { - for (int i = 0; i < size; i+=2) - { - //Get the sample - float input = (float)(short)MAKEWORD(voice[i+1], voice[i]); + //apply AGC + // apply gain to input sample + float output = input * m_Gain; - //apply AGC - // apply gain to input sample - float output = input * m_Gain; + // compute output signal energy, scaled to 0 to 1 + float instantEnergy = abs(output) / m_targetEnergy; - // compute output signal energy, scaled to 0 to 1 - float instantEnergy = abs(output) / m_targetEnergy; + // smooth energy estimate using single-pole low-pass filter + m_EnergyPrime = (1.0f - m_Alpha) * m_EnergyPrime + m_Alpha * instantEnergy; - // smooth energy estimate using single-pole low-pass filter - m_EnergyPrime = (1.0f - m_Alpha) * m_EnergyPrime + m_Alpha * instantEnergy; + // update gain according to output energy + if (m_EnergyPrime > 1e-6f) + m_Gain *= exp( -0.5f * m_Alpha * log(m_EnergyPrime) ); - // update gain according to output energy - if (m_EnergyPrime > 1e-6f) - m_Gain *= exp( -0.5f * m_Alpha * log(m_EnergyPrime) ); + // clamp gain + if (m_Gain > m_GainMax) + m_Gain = m_GainMax; + else if(m_Gain < m_GainMin) + m_Gain = m_GainMin; - // clamp gain - if (m_Gain > m_GainMax) - m_Gain = m_GainMax; - else if(m_Gain < m_GainMin) - m_Gain = m_GainMin; - - //write processed sample back - voice[i] = HIBYTE((short)output); - voice[i+1] = LOBYTE((short)output); - } -} \ No newline at end of file + return output; +} diff --git a/ambed/cagc.h b/ambed/cagc.h index c1547e3..db22b22 100644 --- a/ambed/cagc.h +++ b/ambed/cagc.h @@ -28,16 +28,16 @@ #ifndef cagc_h #define cagc_h -#include "main.h" +#include "csampleprocessor.h" -class CAGC +class CAGC : CSampleProcessor { public: //Constructor CAGC(float initialLeveldB); //methods - void Apply(uint8 * voice, int size); + float ProcessSample(float input); float GetGain();//gets current gain private: diff --git a/ambed/cfirfilter.cpp b/ambed/cfirfilter.cpp index 920ffe3..c7bd0ca 100644 --- a/ambed/cfirfilter.cpp +++ b/ambed/cfirfilter.cpp @@ -43,7 +43,7 @@ CFIRFilter::~CFIRFilter() delete[] m_buffer; } -inline float CFIRFilter::Process(float inputSample) +inline float CFIRFilter::ProcessSample(float inputSample) { float output = 0.0f; int iTaps = 0; @@ -66,17 +66,4 @@ inline float CFIRFilter::Process(float inputSample) return output; } -void CFIRFilter::Process(uint8* voice, int length) -{ - for(int i = 0; i < length; i+=2) - { - //Get the sample - float input = (float)(short)MAKEWORD(voice[i+1], voice[i]); - - float output = Process(input); - //write processed sample back - voice[i] = HIBYTE((short)output); - voice[i+1] = LOBYTE((short)output); - } -} diff --git a/ambed/cfirfilter.h b/ambed/cfirfilter.h index 9d1d9c4..43c2c31 100644 --- a/ambed/cfirfilter.h +++ b/ambed/cfirfilter.h @@ -26,7 +26,7 @@ #ifndef cfirfilter_h #define cfirfilter_h -#include "main.h" +#include "csampleprocessor.h" class CFIRFilter { @@ -38,8 +38,7 @@ public : ~CFIRFilter(); // Processing - float Process(float inputSample); - void Process(uint8* voice, int length); + float ProcessSample(float inputSample); private: float* m_taps; diff --git a/ambed/cfixedgain.cpp b/ambed/cfixedgain.cpp new file mode 100644 index 0000000..4e8645c --- /dev/null +++ b/ambed/cfixedgain.cpp @@ -0,0 +1,44 @@ +// +// cfixedgain.cpp +// ambed +// +// Created by Jean-Luc Deltombe (LX3JL) on 28/04/2017. +// Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved. +// +// ---------------------------------------------------------------------------- +// This file is part of ambed. +// +// xlxd 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. +// +// xlxd 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 Foobar. If not, see . +// ---------------------------------------------------------------------------- +// Geoffrey Merck F4FXL / KC3FRA AGC + +#include "cfixedgain.h" +#include + +//////////////////////////////////////////////////////////////////////////////////////// +// constructor + +CFixedGain::CFixedGain(float gaindB) +{ + m_gaindB = gaindB; + m_gainLinear = pow(10.0f, m_gaindB/20.0f); +} + +//////////////////////////////////////////////////////////////////////////////////////// +// processing + +inline float CFixedGain::ProcessSample(float input) +{ + return input * m_gainLinear; +} \ No newline at end of file diff --git a/ambed/cfixedgain.h b/ambed/cfixedgain.h new file mode 100644 index 0000000..39a2a3f --- /dev/null +++ b/ambed/cfixedgain.h @@ -0,0 +1,45 @@ +// +// cfixedgain.h +// ambed +// +// Created by Jean-Luc Deltombe (LX3JL) on 26/04/2017. +// Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved. +// +// ---------------------------------------------------------------------------- +// This file is part of ambed. +// +// xlxd 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. +// +// xlxd 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 Foobar. If not, see . +// ---------------------------------------------------------------------------- +// Geoffrey Merck F4FXL / KC3FRA + +#ifndef cfixedgain_h +#define cfixedgain_h + +#include "csampleprocessor.h" + +class CFixedGain : CSampleProcessor +{ +public: + //Constructor + CFixedGain(float gaindB); + + //processing + float ProcessSample(float input); + +private: + float m_gaindB; //gain in dB + float m_gainLinear; //linearized gain +}; + +#endif /* cfixedgain_h */ \ No newline at end of file diff --git a/ambed/csampleprocessor.h b/ambed/csampleprocessor.h new file mode 100644 index 0000000..c9ec932 --- /dev/null +++ b/ambed/csampleprocessor.h @@ -0,0 +1,36 @@ +// +// csampleprocessor.h +// ambed +// +// Created by Jean-Luc Deltombe (LX3JL) on 26/04/2017. +// Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved. +// +// ---------------------------------------------------------------------------- +// This file is part of ambed. +// +// xlxd 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. +// +// xlxd 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 Foobar. If not, see . +// ---------------------------------------------------------------------------- +// Geoffrey Merck F4FXL / KC3FRA + +#ifndef csampleprocessor_h +#define csampleprocessor_h + +class CSampleProcessor +{ +public: + //processing + virtual float ProcessSample(float input) = 0; +}; + +#endif /* csampleprocessor_h */ \ No newline at end of file diff --git a/ambed/csignalprocessor.cpp b/ambed/csignalprocessor.cpp new file mode 100644 index 0000000..99ed30a --- /dev/null +++ b/ambed/csignalprocessor.cpp @@ -0,0 +1,89 @@ +// +// cagc.cpp +// ambed +// +// Created by Jean-Luc Deltombe (LX3JL) on 28/04/2017. +// Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved. +// +// ---------------------------------------------------------------------------- +// This file is part of ambed. +// +// xlxd 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. +// +// xlxd 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 Foobar. If not, see . +// ---------------------------------------------------------------------------- +// Geoffrey Merck F4FXL / KC3FRA AGC + +#include "main.h" +#include "csignalprocessor.h" + +#if USE_AGC == 1 +#include "cagc.h" +#else +#include "cfixedgain.h" +#endif + +#if USE_BANDPASSFILTER == 1 +#include "cfirfilter.h" +#endif + +//////////////////////////////////////////////////////////////////////////////////////// +// constructor + +CSignalProcessor::CSignalProcessor(float gaindB) +{ +#if USE_BANDPASSFILTER + m_sampleProcessors.push_back((CSampleProcessor*)new CFIRFilter(FILTER_TAPS, FILTER_TAPS_LENGTH)); +#endif +#if USE_AGC == 1 + m_sampleProcessors.push_back((CSampleProcessor*)new CAGC(gaindB)); +#else + m_sampleProcessors.push_back((CSampleProcessor*)new CFixedGain(gaindB)); +#endif +} + +//////////////////////////////////////////////////////////////////////////////////////// +// destructor + +CSignalProcessor::~CSignalProcessor() +{ + for(int i = 0; i < m_sampleProcessors.size(); i++) + { + delete m_sampleProcessors[i]; + } +} + +//////////////////////////////////////////////////////////////////////////////////////// +// processing + +void CSignalProcessor::Process(uint8* voice, int length) +{ + float sample; + int i; + auto processorsSize = m_sampleProcessors.size(); + + for(int i = 0; i < length; i += 2) + { + //Get the sample + sample = (float)(short)MAKEWORD(voice[i+1], voice[i]); + + for(i = 0; i < processorsSize; i++) + { + sample = m_sampleProcessors[i]->ProcessSample(sample); + } + + //write processed sample back + voice[i] = HIBYTE((short)sample); + voice[i+1] = LOBYTE((short)sample); + } +} \ No newline at end of file diff --git a/ambed/csignalprocessor.h b/ambed/csignalprocessor.h new file mode 100644 index 0000000..da7cedf --- /dev/null +++ b/ambed/csignalprocessor.h @@ -0,0 +1,48 @@ +// +// csignalprocessor.h +// ambed +// +// Created by Jean-Luc Deltombe (LX3JL) on 26/04/2017. +// Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved. +// +// ---------------------------------------------------------------------------- +// This file is part of ambed. +// +// xlxd 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. +// +// xlxd 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 Foobar. If not, see . +// ---------------------------------------------------------------------------- +// Geoffrey Merck F4FXL / KC3FRA + +#ifndef csignalprocessor_h +#define csignalprocessor_h + +#include +#include "csampleprocessor.h" + +class CSignalProcessor +{ +public: + //Constructor + CSignalProcessor(float gaindB); + + //Destructor + ~CSignalProcessor(); + + //Processing + void Process(uint8* voice, int length); + +private: + std::vector m_sampleProcessors; +}; + +#endif /* csignalprocessor_h */ \ No newline at end of file diff --git a/ambed/cusb3xxxinterface.cpp b/ambed/cusb3xxxinterface.cpp index 49c1269..c15801c 100644 --- a/ambed/cusb3xxxinterface.cpp +++ b/ambed/cusb3xxxinterface.cpp @@ -152,15 +152,7 @@ void CUsb3xxxInterface::Task(void) { Queue = Channel->GetVoiceQueue(); CVoicePacket *clone = new CVoicePacket(VoicePacket); -#if USE_BANDPASSFILTER - //Aply band pass before AGC to avoidd amplifying signals we do not want - Channel->ApplyFilter(*clone); -#endif -#if USE_AGC == 1 - Channel->ApplyAGC(*clone); -#else - clone->ApplyGain(Channel->GetSpeechGain()); -#endif + Channel->ProcessSignal(*clone); Queue->push(clone); Channel->ReleaseVoiceQueue(); } diff --git a/ambed/cvocodecchannel.cpp b/ambed/cvocodecchannel.cpp index 8ce57f8..7a10d41 100644 --- a/ambed/cvocodecchannel.cpp +++ b/ambed/cvocodecchannel.cpp @@ -38,12 +38,7 @@ CVocodecChannel::CVocodecChannel(CVocodecInterface *InterfaceIn, int iChIn, CVoc m_InterfaceOut = InterfaceOut; m_iChannelOut = iChOut; m_iSpeechGain = iSpeechGain; -#if USE_AGC == 1 - m_AGC = new CAGC((float)iSpeechGain); -#endif -#if USE_BANDPASSFILTER == 1 - m_filter = new CFIRFilter(FILTER_TAPS, FILTER_TAPS_LENGTH); -#endif + m_signalProcessor = new CSignalProcessor((float)m_iSpeechGain); } //////////////////////////////////////////////////////////////////////////////////////// @@ -52,12 +47,7 @@ CVocodecChannel::CVocodecChannel(CVocodecInterface *InterfaceIn, int iChIn, CVoc CVocodecChannel::~CVocodecChannel() { PurgeAllQueues(); -#if USE_AGC == 1 - delete m_AGC; -#endif -#if USE_BANDPASSFILTER == 1 - delete m_filter; -#endif + delete m_signalProcessor; } //////////////////////////////////////////////////////////////////////////////////////// @@ -103,20 +93,14 @@ uint8 CVocodecChannel::GetCodecOut(void) const return m_InterfaceOut->GetChannelCodec(m_iChannelOut); } -#if USE_AGC == 1 -void CVocodecChannel::ApplyAGC(CVoicePacket& voicePacket) -{ - m_AGC->Apply(voicePacket.GetVoice(), voicePacket.GetVoiceSize()); - //std::cout << "Gain : " << m_AGC.GetGain() << "\n"; -} -#endif +//////////////////////////////////////////////////////////////////////////////////////// +// processing -#if USE_BANDPASSFILTER == 1 -void CVocodecChannel::ApplyFilter(CVoicePacket& voicePacket) +void CVocodecChannel::ProcessSignal(CVoicePacket& voicePacket) { - m_filter->Process(voicePacket.GetVoice(), voicePacket.GetVoiceSize()); + m_signalProcessor->Process(voicePacket.GetVoice(), voicePacket.GetVoiceSize()); } -#endif + //////////////////////////////////////////////////////////////////////////////////////// // queues helpers diff --git a/ambed/cvocodecchannel.h b/ambed/cvocodecchannel.h index 735fa00..9726b9d 100644 --- a/ambed/cvocodecchannel.h +++ b/ambed/cvocodecchannel.h @@ -27,12 +27,7 @@ #define cvocodecchannel_h #include "cpacketqueue.h" -#if USE_AGC == 1 -#include "cagc.h" -#endif -#if USE_BANDPASSFILTER == 1 -#include "cfirfilter.h" -#endif +#include "csignalprocessor.h" #include "cvoicepacket.h" //////////////////////////////////////////////////////////////////////////////////////// @@ -62,12 +57,7 @@ public: int GetSpeechGain(void) const { return m_iSpeechGain; } //Processing -#if USE_AGC == 1 - void ApplyAGC(CVoicePacket& voicePacket); -#endif -#if USE_BANDPASSFILTER - void ApplyFilter(CVoicePacket& voicePacket); -#endif + void ProcessSignal(CVoicePacket& voicePacket); // interfaces bool IsInterfaceIn(const CVocodecInterface *interface) { return (interface == m_InterfaceIn); } @@ -108,12 +98,7 @@ protected: int m_iSpeechGain; private: -#if USE_AGC == 1 - CAGC* m_AGC; -#endif -#if USE_BANDPASSFILTER == 1 - CFIRFilter* m_filter; -#endif + CSignalProcessor* m_signalProcessor; }; //////////////////////////////////////////////////////////////////////////////////////// diff --git a/ambed/cvoicepacket.cpp b/ambed/cvoicepacket.cpp index 0fc05f7..3cfb66e 100644 --- a/ambed/cvoicepacket.cpp +++ b/ambed/cvoicepacket.cpp @@ -69,18 +69,3 @@ void CVoicePacket::SetVoice(const uint8 *voice, int size) ::memcpy(m_uiVoice, voice, m_iSize); } - -//////////////////////////////////////////////////////////////////////////////////////// -// gain - -void CVoicePacket::ApplyGain(int dB) -{ - float mult = pow(10, dB/20.0); - for ( int i = 0; i < m_iSize; i += 2 ) - { - float smp = (float)(short)MAKEWORD(m_uiVoice[i+1], m_uiVoice[i]); - smp *= mult; - m_uiVoice[i] = HIBYTE((short)smp); - m_uiVoice[i+1] = LOBYTE((short)smp); - } -} diff --git a/ambed/cvoicepacket.h b/ambed/cvoicepacket.h index 7dbefc3..bb8e6ce 100644 --- a/ambed/cvoicepacket.h +++ b/ambed/cvoicepacket.h @@ -58,9 +58,6 @@ public: // set void SetVoice(const uint8 *, int); - // gain - void ApplyGain(int); - protected: // data int m_iSize; From 6301fe548518955fe2ada97d84b73c632c17a65a Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Sat, 22 Feb 2020 06:20:54 +0100 Subject: [PATCH 20/25] Fixed segmentation fault --- ambed/csignalprocessor.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ambed/csignalprocessor.cpp b/ambed/csignalprocessor.cpp index 99ed30a..3f67687 100644 --- a/ambed/csignalprocessor.cpp +++ b/ambed/csignalprocessor.cpp @@ -69,7 +69,7 @@ CSignalProcessor::~CSignalProcessor() void CSignalProcessor::Process(uint8* voice, int length) { float sample; - int i; + int j; auto processorsSize = m_sampleProcessors.size(); for(int i = 0; i < length; i += 2) @@ -77,9 +77,9 @@ void CSignalProcessor::Process(uint8* voice, int length) //Get the sample sample = (float)(short)MAKEWORD(voice[i+1], voice[i]); - for(i = 0; i < processorsSize; i++) + for(j = 0; j < processorsSize; j++) { - sample = m_sampleProcessors[i]->ProcessSample(sample); + sample = m_sampleProcessors[j]->ProcessSample(sample); } //write processed sample back From 5fc2974f9b35dda244c4279c34cb9b686c24c68a Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Sat, 22 Feb 2020 06:44:01 +0100 Subject: [PATCH 21/25] Add missing base class --- ambed/cfirfilter.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ambed/cfirfilter.h b/ambed/cfirfilter.h index 43c2c31..52e4b7b 100644 --- a/ambed/cfirfilter.h +++ b/ambed/cfirfilter.h @@ -28,7 +28,7 @@ #include "csampleprocessor.h" -class CFIRFilter +class CFIRFilter : CSampleProcessor { public : //Constructor From 1770dc188f0aacb08861964f17bba5a6fe52456a Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Sat, 4 Apr 2020 05:35:10 +0200 Subject: [PATCH 22/25] Tryning a different filter, might save some CPU --- ambed/main.h | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/ambed/main.h b/ambed/main.h index 62fe65b..bdd512f 100644 --- a/ambed/main.h +++ b/ambed/main.h @@ -109,7 +109,7 @@ typedef unsigned int uint; /* pkg load signal; fsamp = 8000; -fcuts = [200 300 3000 3400]; +fcuts = [300 400 3000 3400]; mags = [0 1 0]; devs = [0.2 1 0.2]; @@ -127,13 +127,10 @@ grid #if USE_BANDPASSFILTER == 1 const float FILTER_TAPS[] { --0.0153779f, 0.0114832f, -0.0060703f, -0.0221526f, 0.0085472f, -0.0449400f, --0.0068112f, -0.0307485f, -0.0548559f, -0.0022596f, -0.0879344f, -0.0166698f, --0.0533627f, -0.1015552f, 0.0424673f, -0.2116654f, 0.1267453f, 0.7375000f, -0.1267453f, -0.2116654f, 0.0424673f, -0.1015552f, -0.0533627f, -0.0166698f, --0.0879344f, -0.0022596f, -0.0548559f, -0.0307485f, -0.0068112f, -0.0449400f, -0.0085472f, -0.0221526f, -0.0060703f, 0.0114832f, -0.0153779f }; -#define FILTER_TAPS_LENGTH 35 +-0.05063341f, -0.00060337f, -0.08892498f, -0.02026701f, -0.05940750f, -0.10977641f, 0.03244024f, -0.22304499f, +0.11452865f, 0.72500000f, 0.11452865f, -0.22304499f, 0.03244024f, -0.10977641f, -0.05940750f, -0.02026701f, +-0.08892498f, -0.00060337f, -0.05063341f }; +#define FILTER_TAPS_LENGTH 19 #endif From 042188770b869b18bb2e9138d100ead73f0ee84d Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Sat, 4 Apr 2020 16:16:46 +0200 Subject: [PATCH 23/25] Back to block processing, more efficient and does not introduce delay --- ambed/cagc.cpp | 40 +++++++++++-------- ambed/cagc.h | 6 +-- ambed/cfirfilter.cpp | 40 +++++++++++-------- ambed/cfirfilter.h | 6 +-- ambed/cfixedgain.cpp | 13 +++++- ambed/cfixedgain.h | 6 +-- ...pleprocessor.h => csampleblockprocessor.h} | 10 +++-- ambed/csignalprocessor.cpp | 17 +++++--- ambed/csignalprocessor.h | 4 +- 9 files changed, 85 insertions(+), 57 deletions(-) rename ambed/{csampleprocessor.h => csampleblockprocessor.h} (83%) diff --git a/ambed/cagc.cpp b/ambed/cagc.cpp index 23ef6e4..880323d 100644 --- a/ambed/cagc.cpp +++ b/ambed/cagc.cpp @@ -62,27 +62,33 @@ float CAGC::GetGain() //////////////////////////////////////////////////////////////////////////////////////// // process -inline float CAGC::ProcessSample(float input) +inline void CAGC::ProcessSampleBlock(uint8* voice, int length) { - //apply AGC - // apply gain to input sample - float output = input * m_Gain; + for(int i = 0; i < length; i += 2) + { + float input = (float)(short)MAKEWORD(voice[i+1], voice[i]); + //apply AGC + // apply gain to input sample + float output = input * m_Gain; - // compute output signal energy, scaled to 0 to 1 - float instantEnergy = abs(output) / m_targetEnergy; + // compute output signal energy, scaled to 0 to 1 + float instantEnergy = abs(output) / m_targetEnergy; - // smooth energy estimate using single-pole low-pass filter - m_EnergyPrime = (1.0f - m_Alpha) * m_EnergyPrime + m_Alpha * instantEnergy; + // smooth energy estimate using single-pole low-pass filter + m_EnergyPrime = (1.0f - m_Alpha) * m_EnergyPrime + m_Alpha * instantEnergy; - // update gain according to output energy - if (m_EnergyPrime > 1e-6f) - m_Gain *= exp( -0.5f * m_Alpha * log(m_EnergyPrime) ); + // update gain according to output energy + if (m_EnergyPrime > 1e-6f) + m_Gain *= exp( -0.5f * m_Alpha * log(m_EnergyPrime) ); - // clamp gain - if (m_Gain > m_GainMax) - m_Gain = m_GainMax; - else if(m_Gain < m_GainMin) - m_Gain = m_GainMin; + // clamp gain + if (m_Gain > m_GainMax) + m_Gain = m_GainMax; + else if(m_Gain < m_GainMin) + m_Gain = m_GainMin; - return output; + //write processed sample back + voice[i] = HIBYTE((short)output); + voice[i+1] = LOBYTE((short)output); + } } diff --git a/ambed/cagc.h b/ambed/cagc.h index db22b22..f0ebf75 100644 --- a/ambed/cagc.h +++ b/ambed/cagc.h @@ -28,16 +28,16 @@ #ifndef cagc_h #define cagc_h -#include "csampleprocessor.h" +#include "csampleblockprocessor.h" -class CAGC : CSampleProcessor +class CAGC : CSampleBlockProcessor { public: //Constructor CAGC(float initialLeveldB); //methods - float ProcessSample(float input); + void ProcessSampleBlock(uint8* voice, int length) ; float GetGain();//gets current gain private: diff --git a/ambed/cfirfilter.cpp b/ambed/cfirfilter.cpp index c7bd0ca..1b704c2 100644 --- a/ambed/cfirfilter.cpp +++ b/ambed/cfirfilter.cpp @@ -43,27 +43,33 @@ CFIRFilter::~CFIRFilter() delete[] m_buffer; } -inline float CFIRFilter::ProcessSample(float inputSample) +inline void CFIRFilter::ProcessSampleBlock(uint8* voice, int length) { - float output = 0.0f; - int iTaps = 0; - - // Buffer latest sample into delay line - m_buffer[m_currentBufferPosition] = inputSample; - - for(int i = m_currentBufferPosition; i >= 0; i--) + for(int i = 0; i < length; i++) { - output += m_taps[iTaps++] * m_buffer[i]; - } + float input = (float)(short)MAKEWORD(voice[i+1], voice[i]); + float output = 0.0f; + int iTaps = 0; - for(int i = m_tapsLength - 1; i > m_currentBufferPosition; i--) - { - output += m_taps[iTaps++] * m_buffer[i]; - } - - m_currentBufferPosition = (m_currentBufferPosition + 1) % m_tapsLength; + // Buffer latest sample into delay line + m_buffer[m_currentBufferPosition] = input; - return output; + for(int i = m_currentBufferPosition; i >= 0; i--) + { + output += m_taps[iTaps++] * m_buffer[i]; + } + + for(int i = m_tapsLength - 1; i > m_currentBufferPosition; i--) + { + output += m_taps[iTaps++] * m_buffer[i]; + } + + m_currentBufferPosition = (m_currentBufferPosition + 1) % m_tapsLength; + + //write processed sample back + voice[i] = HIBYTE((short)output); + voice[i+1] = LOBYTE((short)output); + } } diff --git a/ambed/cfirfilter.h b/ambed/cfirfilter.h index 52e4b7b..85026fb 100644 --- a/ambed/cfirfilter.h +++ b/ambed/cfirfilter.h @@ -26,9 +26,9 @@ #ifndef cfirfilter_h #define cfirfilter_h -#include "csampleprocessor.h" +#include "csampleblockprocessor.h" -class CFIRFilter : CSampleProcessor +class CFIRFilter : CSampleBlockProcessor { public : //Constructor @@ -38,7 +38,7 @@ public : ~CFIRFilter(); // Processing - float ProcessSample(float inputSample); + void ProcessSampleBlock(uint8* voice, int length); private: float* m_taps; diff --git a/ambed/cfixedgain.cpp b/ambed/cfixedgain.cpp index 4e8645c..55faebc 100644 --- a/ambed/cfixedgain.cpp +++ b/ambed/cfixedgain.cpp @@ -38,7 +38,16 @@ CFixedGain::CFixedGain(float gaindB) //////////////////////////////////////////////////////////////////////////////////////// // processing -inline float CFixedGain::ProcessSample(float input) +inline void CFixedGain::ProcessSampleBlock(uint8* voice, int length) { - return input * m_gainLinear; + for(int i = 0; i < length; i++) + { + float input = (float)(short)MAKEWORD(voice[i+1], voice[i]); + //apply gain + float output = input * m_gainLinear; + + //write processed sample back + voice[i] = HIBYTE((short)output); + voice[i+1] = LOBYTE((short)output); + } } \ No newline at end of file diff --git a/ambed/cfixedgain.h b/ambed/cfixedgain.h index 39a2a3f..eadac47 100644 --- a/ambed/cfixedgain.h +++ b/ambed/cfixedgain.h @@ -26,16 +26,16 @@ #ifndef cfixedgain_h #define cfixedgain_h -#include "csampleprocessor.h" +#include "csampleblockprocessor.h" -class CFixedGain : CSampleProcessor +class CFixedGain : CSampleBlockProcessor { public: //Constructor CFixedGain(float gaindB); //processing - float ProcessSample(float input); + void ProcessSampleBlock(uint8* voice, int length); private: float m_gaindB; //gain in dB diff --git a/ambed/csampleprocessor.h b/ambed/csampleblockprocessor.h similarity index 83% rename from ambed/csampleprocessor.h rename to ambed/csampleblockprocessor.h index c9ec932..2c57f5f 100644 --- a/ambed/csampleprocessor.h +++ b/ambed/csampleblockprocessor.h @@ -23,14 +23,16 @@ // ---------------------------------------------------------------------------- // Geoffrey Merck F4FXL / KC3FRA -#ifndef csampleprocessor_h -#define csampleprocessor_h +#ifndef csamplebloclprocessor_h +#define csamplebloclprocessor_h -class CSampleProcessor +#include "main.h" + +class CSampleBlockProcessor { public: //processing - virtual float ProcessSample(float input) = 0; + virtual void ProcessSampleBlock(uint8* voice, int length) = 0; }; #endif /* csampleprocessor_h */ \ No newline at end of file diff --git a/ambed/csignalprocessor.cpp b/ambed/csignalprocessor.cpp index 3f67687..dbb88c2 100644 --- a/ambed/csignalprocessor.cpp +++ b/ambed/csignalprocessor.cpp @@ -43,12 +43,12 @@ CSignalProcessor::CSignalProcessor(float gaindB) { #if USE_BANDPASSFILTER - m_sampleProcessors.push_back((CSampleProcessor*)new CFIRFilter(FILTER_TAPS, FILTER_TAPS_LENGTH)); + m_sampleProcessors.push_back((CSampleBlockProcessor*)new CFIRFilter(FILTER_TAPS, FILTER_TAPS_LENGTH)); #endif #if USE_AGC == 1 m_sampleProcessors.push_back((CSampleProcessor*)new CAGC(gaindB)); #else - m_sampleProcessors.push_back((CSampleProcessor*)new CFixedGain(gaindB)); + m_sampleProcessors.push_back((CSampleBlockProcessor*)new CFixedGain(gaindB)); #endif } @@ -68,11 +68,16 @@ CSignalProcessor::~CSignalProcessor() void CSignalProcessor::Process(uint8* voice, int length) { - float sample; - int j; + /*float sample; + int j;*/ auto processorsSize = m_sampleProcessors.size(); - for(int i = 0; i < length; i += 2) + for(int j = 0; j < processorsSize; j++) + { + m_sampleProcessors[j]->ProcessSampleBlock(voice, length); + } + + /*for(int i = 0; i < length; i += 2) { //Get the sample sample = (float)(short)MAKEWORD(voice[i+1], voice[i]); @@ -85,5 +90,5 @@ void CSignalProcessor::Process(uint8* voice, int length) //write processed sample back voice[i] = HIBYTE((short)sample); voice[i+1] = LOBYTE((short)sample); - } + }*/ } \ No newline at end of file diff --git a/ambed/csignalprocessor.h b/ambed/csignalprocessor.h index da7cedf..a1081d7 100644 --- a/ambed/csignalprocessor.h +++ b/ambed/csignalprocessor.h @@ -27,7 +27,7 @@ #define csignalprocessor_h #include -#include "csampleprocessor.h" +#include "csampleblockprocessor.h" class CSignalProcessor { @@ -42,7 +42,7 @@ public: void Process(uint8* voice, int length); private: - std::vector m_sampleProcessors; + std::vector m_sampleProcessors; }; #endif /* csignalprocessor_h */ \ No newline at end of file From 5cbb115ddb5a61a35db4ed01c0a31b5b498717a5 Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Sat, 4 Apr 2020 16:25:17 +0200 Subject: [PATCH 24/25] Clean up --- ambed/csignalprocessor.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ambed/csignalprocessor.cpp b/ambed/csignalprocessor.cpp index dbb88c2..21fba81 100644 --- a/ambed/csignalprocessor.cpp +++ b/ambed/csignalprocessor.cpp @@ -46,7 +46,7 @@ CSignalProcessor::CSignalProcessor(float gaindB) m_sampleProcessors.push_back((CSampleBlockProcessor*)new CFIRFilter(FILTER_TAPS, FILTER_TAPS_LENGTH)); #endif #if USE_AGC == 1 - m_sampleProcessors.push_back((CSampleProcessor*)new CAGC(gaindB)); + m_sampleProcessors.push_back((CSampleBlockProcessor*)new CAGC(gaindB)); #else m_sampleProcessors.push_back((CSampleBlockProcessor*)new CFixedGain(gaindB)); #endif From 11bc4cb7c7f7e55b362ccc1b81837cb784c50182 Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Sat, 4 Apr 2020 17:51:08 +0200 Subject: [PATCH 25/25] Correct looping through samples --- ambed/cfirfilter.cpp | 2 +- ambed/cfixedgain.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ambed/cfirfilter.cpp b/ambed/cfirfilter.cpp index 1b704c2..67a0fb1 100644 --- a/ambed/cfirfilter.cpp +++ b/ambed/cfirfilter.cpp @@ -45,7 +45,7 @@ CFIRFilter::~CFIRFilter() inline void CFIRFilter::ProcessSampleBlock(uint8* voice, int length) { - for(int i = 0; i < length; i++) + for(int i = 0; i < length; i += 2) { float input = (float)(short)MAKEWORD(voice[i+1], voice[i]); float output = 0.0f; diff --git a/ambed/cfixedgain.cpp b/ambed/cfixedgain.cpp index 55faebc..600df13 100644 --- a/ambed/cfixedgain.cpp +++ b/ambed/cfixedgain.cpp @@ -40,7 +40,7 @@ CFixedGain::CFixedGain(float gaindB) inline void CFixedGain::ProcessSampleBlock(uint8* voice, int length) { - for(int i = 0; i < length; i++) + for(int i = 0; i < length; i += 2) { float input = (float)(short)MAKEWORD(voice[i+1], voice[i]); //apply gain