diff options
| author | Shaun Ruffell <sruffell@digium.com> | 2009-05-07 16:53:32 +0000 |
|---|---|---|
| committer | Shaun Ruffell <sruffell@digium.com> | 2009-05-07 16:53:32 +0000 |
| commit | 86856e80af24bcfaa4829d8d8d90c937a86e6c3f (patch) | |
| tree | 07080eb428adc90800984ff395cdf900ca83fdfa | |
| parent | 68f1c21760ec8ff62c2b9e7ba126ac6522871942 (diff) | |
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.
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@6568 a0bf4364-ded3-4de4-8d8a-66a801d63aff
| -rw-r--r-- | drivers/dahdi/voicebus/GpakCust.h | 9 | ||||
| -rw-r--r-- | drivers/dahdi/wctdm24xxp/base.c | 17 | ||||
| -rw-r--r-- | drivers/dahdi/wcte12xp/base.c | 8 |
3 files changed, 17 insertions, 17 deletions
diff --git a/drivers/dahdi/voicebus/GpakCust.h b/drivers/dahdi/voicebus/GpakCust.h index db5fbdd..72cfdd4 100644 --- a/drivers/dahdi/voicebus/GpakCust.h +++ b/drivers/dahdi/voicebus/GpakCust.h @@ -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; diff --git a/drivers/dahdi/wctdm24xxp/base.c b/drivers/dahdi/wctdm24xxp/base.c index 7b21b5b..4893023 100644 --- a/drivers/dahdi/wctdm24xxp/base.c +++ b/drivers/dahdi/wctdm24xxp/base.c @@ -213,20 +213,9 @@ static int neonmwi_offlimit_cycles; /* Time in milliseconds the monitor is chec 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); diff --git a/drivers/dahdi/wcte12xp/base.c b/drivers/dahdi/wcte12xp/base.c index b97cd5f..7ef378b 100644 --- a/drivers/dahdi/wcte12xp/base.c +++ b/drivers/dahdi/wcte12xp/base.c @@ -60,9 +60,11 @@ static int unchannelized = 0; 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); |