[svn-commits] sruffell: linux/trunk r6568 - in /linux/trunk/drivers/dahdi: voicebus/ wctdm2...

[SVN commits to the Digium repositories]

Author: sruffell
Date: Thu May  7 11:53:32 2009
New Revision: 6568

URL: http://svn.asterisk.org/svn-view/dahdi?view=rev&rev=6568
Log:
voicebus:  Changing default NLP type to 'suppression'.

The 'suppression' default for the NLP provides better echo canceling
performance.  Also ensures that the wctdm24xxp and wcte12xp driver use the
same default values.

Modified:
    linux/trunk/drivers/dahdi/voicebus/GpakCust.h
    linux/trunk/drivers/dahdi/wctdm24xxp/base.c
    linux/trunk/drivers/dahdi/wcte12xp/base.c

Modified: linux/trunk/drivers/dahdi/voicebus/GpakCust.h
URL: http://svn.asterisk.org/svn-view/dahdi/linux/trunk/drivers/dahdi/voicebus/GpakCust.h?view=diff&rev=6568&r1=6567&r2=6568
==============================================================================
--- linux/trunk/drivers/dahdi/voicebus/GpakCust.h (original)
+++ linux/trunk/drivers/dahdi/voicebus/GpakCust.h Thu May  7 11:53:32 2009
@@ -72,6 +72,15 @@
 #define VPM150M_DTMFDETECT		3
 #define VPM150M_ACTIVE			4
 
+#define NLPTYPE_NONE		0
+#define NLPTYPE_MUTE		1
+#define NLPTYPE_RANDOM_NOISE 	2
+#define HOTH_NOISE_NLPTYPE 	3
+#define NLPTYPE_SUPPRESS	4
+#define DEFAULT_NLPTYPE 	NLPTYPE_SUPPRESS
+
+/* This is the threshold (in dB) for enabling and disabling of the NLP */
+#define DEFAULT_NLPTHRESH		24
 
 struct vpmadt032_cmd {
 	struct list_head node;

Modified: linux/trunk/drivers/dahdi/wctdm24xxp/base.c
URL: http://svn.asterisk.org/svn-view/dahdi/linux/trunk/drivers/dahdi/wctdm24xxp/base.c?view=diff&rev=6568&r1=6567&r2=6568
==============================================================================
--- linux/trunk/drivers/dahdi/wctdm24xxp/base.c (original)
+++ linux/trunk/drivers/dahdi/wctdm24xxp/base.c Thu May  7 11:53:32 2009
@@ -213,20 +213,9 @@
 
 static int vpmsupport = 1;
 
-/*
- * This parameter is used to adjust the NLP type used.  The options are:
- * 0 : None
- * 1 : Mute
- * 2 : Random Noise
- * 3 : Hoth Noise
- * 4 : Suppression NLP - In order to use this, you must set the vpmnlpmaxsupp parameter to
- * 	some value in order to give the amount of dB to suppress to the suppressor
- */
-static int vpmnlptype = 1;
-/* This is the threshold (in dB) for enabling and disabling of the NLP */
-static int vpmnlpthresh = 24;
-/* See vpmnlptype = 4 for more info */
-static int vpmnlpmaxsupp = 0;
+static int vpmnlptype = DEFAULT_NLPTYPE;
+static int vpmnlpthresh = DEFAULT_NLPTHRESH;
+static int vpmnlpmaxsupp = DEFAULT_NLPTHRESH;
 
 static int echocan_create(struct dahdi_chan *chan, struct dahdi_echocanparams *ecp,
 			   struct dahdi_echocanparam *p, struct dahdi_echocan_state **ec);

Modified: linux/trunk/drivers/dahdi/wcte12xp/base.c
URL: http://svn.asterisk.org/svn-view/dahdi/linux/trunk/drivers/dahdi/wcte12xp/base.c?view=diff&rev=6568&r1=6567&r2=6568
==============================================================================
--- linux/trunk/drivers/dahdi/wcte12xp/base.c (original)
+++ linux/trunk/drivers/dahdi/wcte12xp/base.c Thu May  7 11:53:32 2009
@@ -60,9 +60,11 @@
 static int latency = VOICEBUS_DEFAULT_LATENCY;
 int vpmsupport = 1;
 static int vpmtsisupport = 0;
-int vpmnlptype = 3;
-int vpmnlpthresh = 24;
-int vpmnlpmaxsupp = 0;
+
+int vpmnlptype = DEFAULT_NLPTYPE;
+int vpmnlpthresh = DEFAULT_NLPTHRESH;
+int vpmnlpmaxsupp = DEFAULT_NLPTHRESH;
+
 static int echocan_create(struct dahdi_chan *chan, struct dahdi_echocanparams *ecp,
 			   struct dahdi_echocanparam *p, struct dahdi_echocan_state **ec);
 static void echocan_free(struct dahdi_chan *chan, struct dahdi_echocan_state *ec);