Changeset 457 for pjproject/trunk/pjmedia/src/pjmedia-codec/gsm.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-codec/gsm.c (modified) (10 diffs)

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

@@ -21 +21 @@
 #include <pjmedia/errno.h>
 #include <pjmedia/endpoint.h>
+#include <pjmedia/plc.h>
 #include <pjmedia/port.h>
+#include <pjmedia/silencedet.h>
 #include <pj/assert.h>
 #include <pj/pool.h>
@@ -69 +71 @@
                                       unsigned output_buf_len, 
                                       struct pjmedia_frame *output);
+static pj_status_t  gsm_codec_recover(pjmedia_codec *codec,
+                                      unsigned output_buf_len,
+                                      struct pjmedia_frame *output);
 
 /* Definition for GSM codec operations. */
@@ -78 +83 @@
     &gsm_codec_parse,
     &gsm_codec_encode,
-    &gsm_codec_decode
+    &gsm_codec_decode,
+    &gsm_codec_recover
 };
 
@@ -101 +107 @@
 } gsm_codec_factory;
 
+
 /* GSM codec private data. */
 struct gsm_data
 {
-    void    *encoder;
-    void    *decoder;
+    void                *encoder;
+    void                *decoder;
+    pj_bool_t            plc_enabled;
+    pjmedia_plc         *plc;
+    pj_bool_t            vad_enabled;
+    pjmedia_silence_det *vad;
 };
 
@@ -240 +251 @@
 
     attr->setting.frm_per_pkt = 1;
-
-    /* Default all flag bits disabled. */
+    attr->setting.vad = 1;
+    attr->setting.plc = 1;
+
+    /* Default all other flag bits disabled. */
 
     return PJ_SUCCESS;
@@ -277 +290 @@
     pjmedia_codec *codec;
     struct gsm_data *gsm_data;
+    pj_status_t status;
 
     PJ_ASSERT_RETURN(factory && id && p_codec, PJ_EINVAL);
@@ -298 +312 @@
                                   sizeof(struct gsm_data));
         codec->codec_data = gsm_data;
+
+        /* Create PLC */
+        status = pjmedia_plc_create(gsm_codec_factory.pool, 8000, 
+                                    160, 0, &gsm_data->plc);
+        if (status != PJ_SUCCESS) {
+            pj_mutex_unlock(gsm_codec_factory.mutex);
+            return status;
+        }
+
+        /* Create silence detector */
+        status = pjmedia_silence_det_create(gsm_codec_factory.pool,
+                                            8000, 160,
+                                            &gsm_data->vad);
+        if (status != PJ_SUCCESS) {
+            pj_mutex_unlock(gsm_codec_factory.mutex);
+            return status;
+        }
     }
 
@@ -361 +392 @@
     if (!gsm_data->decoder)
         return PJMEDIA_CODEC_EFAILED;
+
+    gsm_data->vad_enabled = (attr->setting.vad != 0);
+    gsm_data->plc_enabled = (attr->setting.plc != 0);
 
     return PJ_SUCCESS;
@@ -438 +472 @@
         return PJMEDIA_CODEC_EPCMTOOSHORT;
 
+    /* Detect silence */
+    if (gsm_data->vad_enabled) {
+        pj_bool_t is_silence;
+
+        is_silence = pjmedia_silence_det_detect(gsm_data->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 */
     gsm_encode(gsm_data->encoder, (short*)input->buf, 
                (unsigned char*)output->buf);
@@ -473 +525 @@
     output->type = PJMEDIA_FRAME_TYPE_AUDIO;
 
+    if (gsm_data->plc_enabled)
+        pjmedia_plc_save( gsm_data->plc, output->buf);
+
+    return PJ_SUCCESS;
+}
+
+
+/*
+ * Recover lost frame.
+ */
+static pj_status_t  gsm_codec_recover(pjmedia_codec *codec,
+                                      unsigned output_buf_len,
+                                      struct pjmedia_frame *output)
+{
+    struct gsm_data *gsm_data = codec->codec_data;
+
+    PJ_ASSERT_RETURN(gsm_data->plc_enabled, PJ_EINVALIDOP);
+
+    PJ_ASSERT_RETURN(output_buf_len >= 320, PJMEDIA_CODEC_EPCMTOOSHORT);
+
+    pjmedia_plc_generate(gsm_data->plc, output->buf);
+    output->size = 320;
+
     return PJ_SUCCESS;
 }