[svn-commits] kpfleming: branch 1.4 r3654 - /branches/1.4/

[SVN commits to the Digium repositories]

Author: kpfleming
Date: Thu Jan 10 17:59:02 2008
New Revision: 3654

URL: http://svn.digium.com/view/zaptel?view=rev&rev=3654
Log:
finish converting aggressive suppression mode to runtime control

Modified:
    branches/1.4/kb1ec.h
    branches/1.4/kb1ec_const.h
    branches/1.4/mg2ec.h
    branches/1.4/mg2ec_const.h

Modified: branches/1.4/kb1ec.h
URL: http://svn.digium.com/view/zaptel/branches/1.4/kb1ec.h?view=diff&rev=3654&r1=3653&r2=3654
==============================================================================
--- branches/1.4/kb1ec.h (original)
+++ branches/1.4/kb1ec.h Thu Jan 10 17:59:02 2008
@@ -450,7 +450,7 @@
 #ifndef NO_ECHO_SUPPRESSOR
 	if (ec->aggressive) {
 		if ((ec->HCNTR_d < AGGRESSIVE_HCNTR) && (ec->Ly_i > (ec->Lu_i << 1))) {
-			for (k=0; k < RESIDUAL_SUPRESSION_PASSES; k++) {
+			for (k=0; k < 2; k++) {
 				u = u * (ec->Lu_i >> DEFAULT_SIGMA_LU_I) / ((ec->Ly_i >> (DEFAULT_SIGMA_LY_I)) + 1);
 			}
 #ifdef MEC2_STATS_DETAILED
@@ -463,7 +463,7 @@
 	} else {
 		if (ec->HCNTR_d == 0) { 
 			if ((ec->Ly_i/(ec->Lu_i + 1)) > DEFAULT_SUPPR_I) {
-				for (k=0; k < RESIDUAL_SUPRESSION_PASSES; k++) {
+				for (k=0; k < 1; k++) {
 					u = u * (ec->Lu_i >> DEFAULT_SIGMA_LU_I) / ((ec->Ly_i >> (DEFAULT_SIGMA_LY_I + 2)) + 1);
 				}
 #ifdef MEC2_STATS_DETAILED

Modified: branches/1.4/kb1ec_const.h
URL: http://svn.digium.com/view/zaptel/branches/1.4/kb1ec_const.h?view=diff&rev=3654&r1=3653&r2=3654
==============================================================================
--- branches/1.4/kb1ec_const.h (original)
+++ branches/1.4/kb1ec_const.h Thu Jan 10 17:59:02 2008
@@ -48,15 +48,6 @@
  */
 #define AGGRESSIVE_HCNTR 160		/* in samples, so 160 samples = 20ms */
 
-/* This knob controls the number of passes the residual echo supression 
- * algorithm makes.
- */
-#ifdef AGGRESSIVE_SUPPRESSOR
- #define RESIDUAL_SUPRESSION_PASSES 2
-#else
- #define RESIDUAL_SUPRESSION_PASSES 1
-#endif
-
 
 /***************************************************************/
 /* The following knobs are not implemented in the current code */

Modified: branches/1.4/mg2ec.h
URL: http://svn.digium.com/view/zaptel/branches/1.4/mg2ec.h?view=diff&rev=3654&r1=3653&r2=3654
==============================================================================
--- branches/1.4/mg2ec.h (original)
+++ branches/1.4/mg2ec.h Thu Jan 10 17:59:02 2008
@@ -572,7 +572,7 @@
 #ifndef NO_ECHO_SUPPRESSOR
 	if (ec->aggressive) {
 		if ((ec->HCNTR_d < AGGRESSIVE_HCNTR) && (ec->Ly_i > (ec->Lu_i << 1))) {
-			for (k=0; k < RESIDUAL_SUPRESSION_PASSES; k++) {
+			for (k=0; k < 2; k++) {
 				u = u * (ec->Lu_i >> DEFAULT_SIGMA_LU_I) / ((ec->Ly_i >> (DEFAULT_SIGMA_LY_I)) + 1);
 			}
 #ifdef MEC2_STATS_DETAILED
@@ -585,7 +585,7 @@
 	} else {
 		if (ec->HCNTR_d == 0) { 
 			if ((ec->Ly_i/(ec->Lu_i + 1)) > DEFAULT_SUPPR_I) {
-				for (k=0; k < RESIDUAL_SUPRESSION_PASSES; k++) {
+				for (k=0; k < 1; k++) {
 					u = u * (ec->Lu_i >> DEFAULT_SIGMA_LU_I) / ((ec->Ly_i >> (DEFAULT_SIGMA_LY_I + 2)) + 1);
 				}
 #ifdef MEC2_STATS_DETAILED

Modified: branches/1.4/mg2ec_const.h
URL: http://svn.digium.com/view/zaptel/branches/1.4/mg2ec_const.h?view=diff&rev=3654&r1=3653&r2=3654
==============================================================================
--- branches/1.4/mg2ec_const.h (original)
+++ branches/1.4/mg2ec_const.h Thu Jan 10 17:59:02 2008
@@ -48,15 +48,6 @@
  */
 #define AGGRESSIVE_HCNTR 160		/* in samples, so 160 samples = 20ms */
 
-/* This knob controls the number of passes the residual echo supression 
- * algorithm makes.
- */
-#ifdef AGGRESSIVE_SUPPRESSOR
- #define RESIDUAL_SUPRESSION_PASSES 2
-#else
- #define RESIDUAL_SUPRESSION_PASSES 1
-#endif
-
 /* Treat sample as error if it has a different sign as the
  * input signal and is this number larger in ABS() as
  * the input-signal */