Changeset 457 for pjproject/trunk/pjmedia/src/pjmedia-codec/speex_codec.c

Timestamp:

May 19, 2006 3:58:13 PM (17 years ago)

Author:

bennylp

Message:

Install VAD in g711, gsm, and speex, and add the DTX support in stream.c. Also changed the way the silence detector works, and changed default speex quality/complexity to 10

File:

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

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

@@ -38 +38 @@
 #define THIS_FILE   "speex_codec.c"
 
-#define DEFAULT_QUALITY     4
-#define DEFAULT_COMPLEXITY  -1
+#define DEFAULT_QUALITY     10
+#define DEFAULT_COMPLEXITY  10
 
 /* Prototypes for Speex factory */
@@ -256 +256 @@
 
     /* Somehow quality <=4 is broken in linux. */
-    if (quality <= 4) {
-        PJ_LOG(4,(THIS_FILE, "Adjusting quality to 5 for uwb"));
+    if (quality <= 4 && quality >= 0) {
+        PJ_LOG(5,(THIS_FILE, "Adjusting quality to 5 for uwb"));
         spx_factory.speex_param[PARAM_UWB].quality = 5;
     }
@@ -412 +412 @@
     attr->setting.lpf =1 ;
     attr->setting.penh =1 ;
-
-    /* Default, set VAD off as it caused voice chip off */
-    attr->setting.vad = 0;
+    attr->setting.vad = 1;
 
     return PJ_SUCCESS;
@@ -572 +570 @@
 
     /* VAD */
-    tmp = attr->setting.vad;
+    tmp = (attr->setting.vad != 0);
     speex_encoder_ctl(spx->enc, SPEEX_SET_VAD, &tmp);
+    speex_encoder_ctl(spx->enc, SPEEX_SET_DTX, &tmp);
 
     /* Complexity */
@@ -688 +687 @@
     pj_int16_t *samp_in;
     unsigned i, samp_count, sz;
+    int tx;
 
     spx = (struct spx_private*) codec->codec_data;
@@ -711 +711 @@
 
     /* Encode the frame */
-    speex_encode(spx->enc, tmp, &spx->enc_bits);
+    tx = speex_encode(spx->enc, tmp, &spx->enc_bits);
+
+    /* Check if we need not to transmit the frame (DTX) */
+    if (tx == 0) {
+        output->buf = NULL;
+        output->size = 0;
+        output->timestamp.u64 = input->timestamp.u64;
+        output->type = PJMEDIA_FRAME_TYPE_NONE;
+        return PJ_SUCCESS;
+    }
 
     /* Check size. */