Changeset 457 for pjproject/trunk/pjmedia/src/pjmedia/g711.c

Timestamp:

May 19, 2006 3:58:13 PM (18 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/g711.c (modified) (7 diffs)

pjproject/trunk/pjmedia/src/pjmedia/g711.c

@@ -25 +25 @@
 #include <pjmedia/port.h>
 #include <pjmedia/plc.h>
+#include <pjmedia/silencedet.h>
 #include <pj/pool.h>
 #include <pj/string.h>
@@ -122 +123 @@
 struct g711_private
 {
-    unsigned        pt;
-    pj_bool_t       plc_enabled;
-    pjmedia_plc    *plc;
+    unsigned             pt;
+    pj_bool_t            plc_enabled;
+    pjmedia_plc         *plc;
+    pj_bool_t            vad_enabled;
+    pjmedia_silence_det *vad;
 };
 
@@ -251 +254 @@
     attr->setting.plc = 1;
 
-    /* Default all flag bits disabled. */
+    /* Enable VAD by default. */
+    attr->setting.vad = 1;
+
+    /* Default all other flag bits disabled. */
 
     return PJ_SUCCESS;
@@ -303 +309 @@
 
         codec = pj_pool_alloc(g711_factory.pool, sizeof(pjmedia_codec));
-        codec_priv = pj_pool_alloc(g711_factory.pool, 
-                                   sizeof(struct g711_private));
+        codec_priv = pj_pool_zalloc(g711_factory.pool, 
+                                    sizeof(struct g711_private));
         if (!codec || !codec_priv) {
             pj_mutex_unlock(g711_factory.mutex);
@@ -321 +327 @@
         }
 
+        /* Create VAD */
+        status = pjmedia_silence_det_create(g711_factory.pool,
+                                            8000, 80,
+                                            &codec_priv->vad);
+        if (status != PJ_SUCCESS) {
+            pj_mutex_unlock(g711_factory.mutex);
+            return status;
+        }
+
         codec->factory = factory;
         codec->op = &g711_op;
@@ -379 +394 @@
     priv->pt = attr->info.pt;
     priv->plc_enabled = (attr->setting.plc != 0);
+    priv->vad_enabled = (attr->setting.vad != 0);
     return PJ_SUCCESS;
 }
@@ -429 +445 @@
     if (output_buf_len < input->size / 2)
         return PJMEDIA_CODEC_EFRMTOOSHORT;
+
+    /* Detect silence if VAD is enabled */
+    if (priv->vad_enabled) {
+        pj_bool_t is_silence;
+
+        is_silence = pjmedia_silence_det_detect(priv->vad, input->buf, 
+                                                input->size / 2, NULL);
+        if (is_silence) {
+            output->type = PJMEDIA_FRAME_TYPE_NONE;
+            output->buf = NULL;
+            output->size = 0;
+            output->timestamp.u64 = input->timestamp.u64;
+            return PJ_SUCCESS;
+        }
+    }
 
     /* Encode */