Changeset 291 for pjproject/trunk

Timestamp:

Mar 6, 2006 1:32:57 PM (19 years ago)

Author:

bennylp

Message:

Changed Speex defaults: complexity=-1, vad=off. Tested with EyeBeam?

File:

• pjproject/trunk/pjmedia/src/pjmedia-codec/speex_codec.c (modified) (7 diffs)

pjproject/trunk/pjmedia/src/pjmedia-codec/speex_codec.c

@@ -29 +29 @@
 #include <pj/os.h>
 
-#define DEFAULT_QUALITY     8
-#define DEFAULT_COMPLEXITY  8
+#define DEFAULT_QUALITY     4
+#define DEFAULT_COMPLEXITY  -1
 
 
@@ -103 +103 @@
 struct speex_param
 {
-    int     enabled;    /* Is this mode enabled?                */
-    const SpeexMode *mode;  /* Speex mode.                      */
-    int     pt;         /* Payload type.                        */
-    unsigned clock_rate;/* Default sampling rate to be used.    */
-    int     quality;    /* Default encoder quality to be used.  */
-    int     complexity; /* Default encoder complexity.          */
-    int     samples_per_frame;  /* Samples per frame.           */
-    int     framesize;  /* Frame size for current mode.         */
-    int     bitrate;    /* Bit rate for current mode.           */
+    int              enabled;           /* Is this mode enabled?            */
+    const SpeexMode *mode;              /* Speex mode.                      */
+    int              pt;                /* Payload type.                    */
+    unsigned         clock_rate;        /* Default sampling rate to be used.*/
+    int              quality;           /* Default encoder quality.         */
+    int              complexity;        /* Default encoder complexity.      */
+    int              samples_per_frame; /* Samples per frame.               */
+    int              framesize;         /* Frame size for current mode.     */
+    int              bitrate;           /* Bit rate for current mode.       */
 };
 
@@ -129 +129 @@
 struct spx_private
 {
-    //pjmedia_codec_info         info;              /**< Codec info.            */
-
     int                  param_id;          /**< Index to speex param.  */
 
@@ -154 +152 @@
 
     /* Set the quality */
-    speex_encoder_ctl(state, SPEEX_SET_QUALITY, &p->quality);
+    if (p->quality != -1)
+        speex_encoder_ctl(state, SPEEX_SET_QUALITY, &p->quality);
 
     /* Sampling rate. */
     speex_encoder_ctl(state, SPEEX_SET_SAMPLING_RATE, &p->clock_rate);
 
-    /* VAD */
-    tmp = 1;
+    /* VAD off to have max bitrate */
+    tmp = 0;
     speex_encoder_ctl(state, SPEEX_SET_VAD, &tmp);
 
     /* Complexity. */
-    speex_encoder_ctl(state, SPEEX_SET_COMPLEXITY, &p->complexity);
+    if (p->complexity != -1)
+        speex_encoder_ctl(state, SPEEX_SET_COMPLEXITY, &p->complexity);
 
     /* Now get the frame size */
@@ -393 +393 @@
     attr->lpf_enabled =1 ;
     attr->penh_enabled =1 ;
-    attr->vad_enabled = 1;
+
+    /* Default, set VAD off as it caused voice chip off */
+    attr->vad_enabled = 0;
 
     return PJ_SUCCESS;
@@ -558 +560 @@
 
     /* Set the quality*/
-    speex_encoder_ctl(spx->enc, SPEEX_SET_QUALITY, 
-                      &spx_factory.speex_param[id].quality);
+    if (spx_factory.speex_param[id].quality != -1) {
+        speex_encoder_ctl(spx->enc, SPEEX_SET_QUALITY, 
+                          &spx_factory.speex_param[id].quality);
+    }
 
     /* Sampling rate. */
@@ -571 +575 @@
 
     /* Complexity */
-    speex_encoder_ctl(spx->enc, SPEEX_SET_BITRATE, 
-                      &spx_factory.speex_param[id].complexity);
-
-    /* Bitrate */
-    speex_encoder_ctl(spx->enc, SPEEX_SET_BITRATE, 
-                      &spx_factory.speex_param[id].bitrate);
+    if (spx_factory.speex_param[id].complexity != -1) {
+        speex_encoder_ctl(spx->enc, SPEEX_SET_COMPLEXITY, 
+                          &spx_factory.speex_param[id].complexity);
+    }
 
     /*