diff options
| author | Nanang Izzuddin <nanang@teluu.com> | 2008-11-19 14:48:10 +0000 |
|---|---|---|
| committer | Nanang Izzuddin <nanang@teluu.com> | 2008-11-19 14:48:10 +0000 |
| commit | 79c94381fbd13ef276a89f3a823cb5262a5c650b (patch) | |
| tree | 1ec3fcd3274014d10858ae202a3539298e76c5f9 | |
| parent | e9d5f420afbce16f5fefbccb6167d5249c4bc414 (diff) | |
Ticket #676: Updated default value of maximum silence theshold setting to MAXUINT16+1 (feature is disabled).
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@2368 74dad513-b988-da41-8d7b-12977e46ad98
| -rw-r--r-- | pjmedia/include/pjmedia/config.h | 8 | ||||
| -rw-r--r-- | pjmedia/src/pjmedia/silencedet.c | 4 |
2 files changed, 7 insertions, 5 deletions
diff --git a/pjmedia/include/pjmedia/config.h b/pjmedia/include/pjmedia/config.h index 2f008dad..170797dd 100644 --- a/pjmedia/include/pjmedia/config.h +++ b/pjmedia/include/pjmedia/config.h @@ -425,7 +425,7 @@ /** * Suggested or default threshold to be set for fixed silence detection * or as starting threshold for adaptive silence detection. The threshold - * has the range from zero to 255. + * has the range from zero to 0xFFFF. */ #ifndef PJMEDIA_SILENCE_DET_THRESHOLD # define PJMEDIA_SILENCE_DET_THRESHOLD 4 @@ -437,10 +437,12 @@ * will not cut the audio transmission if the audio level is above this * level. * - * Default: 25 + * Use 0x10000 (or greater) to disable this feature. + * + * Default: 0x10000 (disabled) */ #ifndef PJMEDIA_SILENCE_DET_MAX_THRESHOLD -# define PJMEDIA_SILENCE_DET_MAX_THRESHOLD 25 +# define PJMEDIA_SILENCE_DET_MAX_THRESHOLD 0x10000 #endif diff --git a/pjmedia/src/pjmedia/silencedet.c b/pjmedia/src/pjmedia/silencedet.c index 3b8e0116..8be61708 100644 --- a/pjmedia/src/pjmedia/silencedet.c +++ b/pjmedia/src/pjmedia/silencedet.c @@ -25,7 +25,7 @@ #define THIS_FILE "silencedet.c" -#if 0 +#if 1 # define TRACE_(x) PJ_LOG(3,x) #else # define TRACE_(x) @@ -223,7 +223,7 @@ PJ_DEF(pj_bool_t) pjmedia_silence_det_apply( pjmedia_silence_det *sd, avg_recent_level = (sd->sum_level / sd->sum_cnt); if (level > sd->threshold || - (level >> 8) >= PJMEDIA_SILENCE_DET_MAX_THRESHOLD) + level >= PJMEDIA_SILENCE_DET_MAX_THRESHOLD) { sd->silence_timer = 0; sd->voiced_timer += sd->ptime; |