Changeset 391:97601d42821a in mediastreamer2

Timestamp:

Mar 31, 2009 10:32:34 AM (4 years ago)

Author:

aymeric <aymeric@…>

Branch:

default

Message:

clean up PSD computing on high frequency

git-svn-id: ​svn+ssh://svn.savannah.nongnu.org/linphone/trunk@394 3f6dc0c8-ddfe-455d-9043-3cd528dc4637

File:

• linphone/mediastreamer2/src/msconf.c (modified) (5 diffs)

linphone/mediastreamer2/src/msconf.c

@@ -132 +132 @@
         /* enable AGC only on local soundcard */
         val=0;
-        f=8000;
+        f=12000;
         if (s->agc_level>0 && pos==0)
                 val=1;
@@ -138 +138 @@
                 val=1;
         else if ( pos%2==1 && s->enable_halfduplex>0)
-                val=1;
+                val=1; //1; should not do that
         if (s->agc_level>0)
                 f=(float)s->agc_level;
@@ -267 +267 @@
         speex_preprocess_ctl(chan->speex_pp, SPEEX_PREPROCESS_GET_PSD, ps);
 
-
         mystat = 0;
         for (i=ps_size/2;i < ps_size; i++) {
@@ -278 +277 @@
                 yp = yp * fftmul;
                 yp = MIN(yp * 3000.0, 1.0);
+                yp = (1 - yp) * (100 - 1.0f);
                 mystat = yp + mystat;
         }
 
+        mystat = (mystat*2)/ps_size;
+
         ortp_free(ps);
 
-        /* value between 0 and 100? */
-        mystat = mystat*100*2/ps_size;
-        if (mystat<0)
-                mystat=0;
-        if (mystat>100)
-                mystat=100;
-
-        return mystat;
+        //ms_message("average power spectrum on half highest values ONLY: stat=%.3lf", 108.064 - mystat);
+        /* values:
+        Maximum: 108,064 low volume on high frequency.
+        Decrease when volume increase. */
+
+        /* return value between 0 and 108,064? */
+        return 108.064-mystat;
 }
 #endif
@@ -403 +404 @@
                                 {
                                         double mystat = powerspectrum_stat_beyond8K(chan);
-                                        //ms_message("is_speaking (chan=%i) -> on/stat=%.3lf", i, mystat);
-                                        if (mystat>10)
+                                        if (mystat>12)
                                         {
                                                 ms_message("is_speaking (chan=%i) -> on/stat=%.3lf", i, mystat);