From a6bbbcd1d26a2f16cfd2639cef631e60ba5406f1 Mon Sep 17 00:00:00 2001 From: aymeric Date: Sat, 28 Mar 2009 15:00:21 +0000 Subject: [PATCH] Increase default pin number for msconf and remove useless define and commented code. git-svn-id: svn+ssh://svn.savannah.nongnu.org/linphone/trunk@378 3f6dc0c8-ddfe-455d-9043-3cd528dc4637 --- linphone/mediastreamer2/src/msconf.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/linphone/mediastreamer2/src/msconf.c b/linphone/mediastreamer2/src/msconf.c index 03c8201a5..2d1c4554e 100644 --- a/linphone/mediastreamer2/src/msconf.c +++ b/linphone/mediastreamer2/src/msconf.c @@ -37,13 +37,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include #endif -#ifndef CONF_GRAN_MAX -#define CONF_GRAN_MAX 12 /* limit for 'too much data' */ -#endif - #define CONF_NSAMPLES 160*4*4 /* (CONF_GRAN/2) */ #ifndef CONF_MAX_PINS -#define CONF_MAX_PINS 32 +#define CONF_MAX_PINS 128 #endif static const float max_e=(float)32767*32767; @@ -410,7 +406,7 @@ static void conf_sum(MSFilter *f, ConfState *s){ if (mystat>10) { ms_message("is_speaking (chan=%i) -> on/stat=%.3lf", i, mystat); - s->channels[0].is_speaking=20; /* keep RTP muted for the next few ms */ + s->channels[0].is_speaking=20; /* keep RTP unmuted for the next few ms */ } else { @@ -492,7 +488,7 @@ static void conf_dispatch(MSFilter *f, ConfState *s){ int i; Channel *chan; mblk_t *m; - //memset(s->sum,0,s->conf_nsamples*sizeof(int)); + for (i=0;ioutputs[i]!=NULL){ chan=&s->channels[i];