Commit a6bbbcd1 authored by aymeric's avatar aymeric
Browse files

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
parent 6ac9f02b
...@@ -37,13 +37,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ...@@ -37,13 +37,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <speex/speex_preprocess.h> #include <speex/speex_preprocess.h>
#endif #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) */ #define CONF_NSAMPLES 160*4*4 /* (CONF_GRAN/2) */
#ifndef CONF_MAX_PINS #ifndef CONF_MAX_PINS
#define CONF_MAX_PINS 32 #define CONF_MAX_PINS 128
#endif #endif
static const float max_e=(float)32767*32767; static const float max_e=(float)32767*32767;
...@@ -410,7 +406,7 @@ static void conf_sum(MSFilter *f, ConfState *s){ ...@@ -410,7 +406,7 @@ static void conf_sum(MSFilter *f, ConfState *s){
if (mystat>10) if (mystat>10)
{ {
ms_message("is_speaking (chan=%i) -> on/stat=%.3lf", i, mystat); 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 else
{ {
...@@ -492,7 +488,7 @@ static void conf_dispatch(MSFilter *f, ConfState *s){ ...@@ -492,7 +488,7 @@ static void conf_dispatch(MSFilter *f, ConfState *s){
int i; int i;
Channel *chan; Channel *chan;
mblk_t *m; mblk_t *m;
//memset(s->sum,0,s->conf_nsamples*sizeof(int));
for (i=0;i<CONF_MAX_PINS;++i){ for (i=0;i<CONF_MAX_PINS;++i){
if (f->outputs[i]!=NULL){ if (f->outputs[i]!=NULL){
chan=&s->channels[i]; chan=&s->channels[i];
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment