Changeset 888 for pjproject/trunk/pjmedia/src/pjmedia-codec/ilbc.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-codec/ilbc.c (modified) (9 diffs)

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

@@ -129 +129 @@
     pj_bool_t            vad_enabled;
     pj_bool_t            plc_enabled;
+    pj_timestamp         last_tx;
 
     pj_bool_t            enc_ready;
@@ -427 +428 @@
         return status;
 
+    /* Init last_tx (not necessary because of zalloc, but better
+     * be safe in case someone remove zalloc later.
+     */
+    pj_set_timestamp32(&ilbc_codec->last_tx, 0, 0);
+
     PJ_LOG(5,(ilbc_codec->obj_name, 
               "iLBC codec opened, encoder mode=%d, decoder mode=%d",
@@ -513 +519 @@
         return PJMEDIA_CODEC_EFRMTOOSHORT;
 
-    if (input->size != ilbc_codec->enc_samples_per_frame * 2)
+    if (input->size != (ilbc_codec->enc_samples_per_frame << 1))
         return PJMEDIA_CODEC_EPCMFRMINLEN;
 
@@ -519 +525 @@
     if (ilbc_codec->vad_enabled) {
         pj_bool_t is_silence;
+        pj_int32_t silence_period;
+
+        silence_period = pj_timestamp_diff32(&ilbc_codec->last_tx,
+                                              &input->timestamp);
 
         is_silence = pjmedia_silence_det_detect(ilbc_codec->vad, 
                                                 input->buf,
-                                                input->size / 2,
+                                                (input->size >> 1),
                                                 NULL);
-        if (is_silence) {
+        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 {
+            ilbc_codec->last_tx = input->timestamp;
         }
     }
@@ -545 +560 @@
     output->type = PJMEDIA_FRAME_TYPE_AUDIO;
     output->size = ilbc_codec->enc.no_of_bytes;
-    output->timestamp.u64 = input->timestamp.u64;
+    output->timestamp = input->timestamp;
 
     return PJ_SUCCESS;
@@ -564 +579 @@
     PJ_ASSERT_RETURN(input && output, PJ_EINVAL);
 
-    if (output_buf_len < ilbc_codec->dec_samples_per_frame*2)
+    if (output_buf_len < (ilbc_codec->dec_samples_per_frame << 1))
         return PJMEDIA_CODEC_EPCMTOOSHORT;
 
@@ -578 +593 @@
         ((short*)output->buf)[i] = (short)ilbc_codec->dec_block[i];
     }
-    output->size = ilbc_codec->dec_samples_per_frame * 2;
+    output->size = (ilbc_codec->dec_samples_per_frame << 1);
     output->type = PJMEDIA_FRAME_TYPE_AUDIO;
-    output->timestamp.u64 = input->timestamp.u64;
+    output->timestamp = input->timestamp;
 
     return PJ_SUCCESS;
@@ -599 +614 @@
     PJ_ASSERT_RETURN(output, PJ_EINVAL);
 
-    if (output_buf_len < ilbc_codec->dec_samples_per_frame*2)
+    if (output_buf_len < (ilbc_codec->dec_samples_per_frame << 1))
         return PJMEDIA_CODEC_EPCMTOOSHORT;
 
@@ -609 +624 @@
         ((short*)output->buf)[i] = (short)ilbc_codec->dec_block[i];
     }
-    output->size = ilbc_codec->dec_samples_per_frame * 2;
+    output->size = (ilbc_codec->dec_samples_per_frame << 1);
     output->type = PJMEDIA_FRAME_TYPE_AUDIO;