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

Timestamp:

Jan 20, 2007 5:18:14 AM (18 years ago)

Author:

bennylp

Message:

Implement ticket #56: Periodically transmit RTP packet on silence, to maintain NAT binding etc.

File:

• pjproject/trunk/pjmedia/src/pjmedia/g711.c (modified) (7 diffs)

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

@@ -126 +126 @@
     pj_bool_t            vad_enabled;
     pjmedia_silence_det *vad;
+    pj_timestamp         last_tx;
 };
 
@@ -466 +467 @@
 
     /* Check output buffer length */
-    if (output_buf_len < input->size / 2)
+    if (output_buf_len < (input->size >> 1))
         return PJMEDIA_CODEC_EFRMTOOSHORT;
 
@@ -472 +473 @@
     if (priv->vad_enabled) {
         pj_bool_t is_silence;
+        pj_int32_t silence_period;
+
+        silence_period = pj_timestamp_diff32(&priv->last_tx,
+                                             &input->timestamp);
 
         is_silence = pjmedia_silence_det_detect(priv->vad, input->buf, 
-                                                input->size / 2, NULL);
-        if (is_silence) {
+                                                (input->size >> 1), NULL);
+        if (is_silence && 
+            PJMEDIA_CODEC_MAX_SILENCE_PERIOD != -1 &&
+            silence_period < PJMEDIA_CODEC_MAX_SILENCE_PERIOD) 
+        {
             output->type = PJMEDIA_FRAME_TYPE_NONE;
             output->buf = NULL;
             output->size = 0;
-            output->timestamp.u64 = input->timestamp.u64;
+            output->timestamp = input->timestamp;
             return PJ_SUCCESS;
+        } else {
+            priv->last_tx = input->timestamp;
         }
     }
@@ -486 +496 @@
     /* Encode */
     if (priv->pt == PJMEDIA_RTP_PT_PCMA) {
-        unsigned i;
+        unsigned i, n;
         pj_uint8_t *dst = output->buf;
 
-        for (i=0; i!=input->size/2; ++i, ++dst) {
+        n = (input->size >> 1);
+        for (i=0; i!=n; ++i, ++dst) {
             *dst = pjmedia_linear2alaw(samples[i]);
         }
     } else if (priv->pt == PJMEDIA_RTP_PT_PCMU) {
-        unsigned i;
+        unsigned i, n;
         pj_uint8_t *dst = output->buf;
 
-        for (i=0; i!=input->size/2; ++i, ++dst) {
+        n = (input->size >> 1);
+        for (i=0; i!=n; ++i, ++dst) {
             *dst = pjmedia_linear2ulaw(samples[i]);
         }
@@ -505 +517 @@
 
     output->type = PJMEDIA_FRAME_TYPE_AUDIO;
-    output->size = input->size / 2;
+    output->size = (input->size >> 1);
 
     return PJ_SUCCESS;
@@ -518 +530 @@
 
     /* Check output buffer length */
-    PJ_ASSERT_RETURN(output_buf_len >= input->size * 2,
+    PJ_ASSERT_RETURN(output_buf_len >= (input->size << 1),
                      PJMEDIA_CODEC_EPCMTOOSHORT);
 
@@ -548 +560 @@
 
     output->type = PJMEDIA_FRAME_TYPE_AUDIO;
-    output->size = input->size * 2;
+    output->size = (input->size << 1);
 
     if (priv->plc_enabled)