Changeset 1679

Timestamp:

Jan 11, 2008 4:30:22 PM (17 years ago)

Author:

bennylp

Message:

Updated encdec sample to support PLC etc

File:

• pjproject/trunk/pjsip-apps/src/samples/encdec.c (modified) (7 diffs)

pjproject/trunk/pjsip-apps/src/samples/encdec.c

@@ -53 +53 @@
 ;
 
-#define HAS_G729_CODEC  0
+#ifndef HAS_G729_CODEC
+# define HAS_G729_CODEC 0
+#endif
+
 #if HAS_G729_CODEC
-#include "keystream_g729ab.h"
-#endif
-
-#if 0
+#include <keystream_g729ab.h>
+#endif
+
+//#undef PJ_TRACE
+//#define PJ_TRACE 1
+
+#ifndef PJ_TRACE
+#       define PJ_TRACE 0
+#endif
+
+#if PJ_TRACE
 #   define TRACE_(expr)     PJ_LOG(4,expr)
 #else
@@ -91 +101 @@
     pjmedia_codec_mgr *cm;
     pjmedia_codec *codec;
-    pjmedia_codec_info *pci;
+    const pjmedia_codec_info *pci;
     pjmedia_codec_param param;
     unsigned cnt, samples_per_frame;
     pj_str_t tmp;
     pjmedia_port *wavin, *wavout;
+    unsigned lost_pct;
     pj_status_t status;
 
+#define T   file_msec_duration/1000, file_msec_duration%1000
+    
     pool = pjmedia_endpt_create_pool(mept, "encdec", 1000, 1000);
 
     cm = pjmedia_endpt_get_codec_mgr(mept);
 
+#ifdef LOST_PCT
+    lost_pct = LOST_PCT;
+#else
+    lost_pct = 0;
+#endif
+    
     cnt = 1;
     CHECK( pjmedia_codec_mgr_find_codecs_by_id(cm, pj_cstr(&tmp, codec_id), 
@@ -110 +129 @@
 
     /* Control VAD */
-    param.setting.vad = 0;
+    param.setting.vad = 1;
 
     /* Open wav for reading */
@@ -144 +163 @@
             break;;
 
+        /* Update duration */
+        file_msec_duration += samples_per_frame * 1000 / 
+                              param.info.clock_rate;
+
         /* Encode */
         frm_bit.buf = bitstream;
@@ -149 +172 @@
         CHECK(codec->op->encode(codec, &frm_pcm, sizeof(bitstream), &frm_bit));
 
+        /* On DTX, write zero frame to wavout to maintain duration */
+        if (frm_bit.size == 0 || frm_bit.type != PJMEDIA_FRAME_TYPE_AUDIO) {
+            out_frm.buf = (char*)pcmbuf;
+            out_frm.size = 160;
+            CHECK( pjmedia_port_put_frame(wavout, &out_frm) );
+            TRACE_((THIS_FILE, "%d.%03d read: %u, enc: %u",
+                    T, frm_pcm.size, frm_bit.size));
+            continue;
+        }
+        
+        /* Simulate jitter buffer bug */
+        if (pci->pt==PJMEDIA_RTP_PT_G729 && frm_bit.size == 2) {
+            TRACE_((THIS_FILE, "%d.%03d G729 SID frame masqueraded", T));
+            frm_bit.size = 10;
+        }
+        
         /* Parse the bitstream (not really necessary for this case
          * since we always decode 1 frame, but it's still good
@@ -159 +198 @@
         CHECK( (cnt==1 ? PJ_SUCCESS : -1) );
 
-        /* Decode */
+        /* Decode or simulate packet loss */
         out_frm.buf = (char*)pcmbuf;
         out_frm.size = sizeof(pcmbuf);
-        CHECK( codec->op->decode(codec, &frames[0], sizeof(pcmbuf), 
-                                 &out_frm) );
+        
+        if ((pj_rand() % 100) < lost_pct) {
+            /* Simulate loss */
+            CHECK( codec->op->recover(codec, sizeof(pcmbuf), &out_frm) );
+            TRACE_((THIS_FILE, "%d.%03d Packet lost", T));
+        } else {
+            /* Decode */
+            CHECK( codec->op->decode(codec, &frames[0], sizeof(pcmbuf), 
+                                     &out_frm) );
+        }
 
         /* Write to WAV */
         CHECK( pjmedia_port_put_frame(wavout, &out_frm) );
 
-        file_msec_duration += samples_per_frame * 1000 / 
-                              param.info.clock_rate;
-
-        TRACE_((THIS_FILE, "Bytes read: %u, encode: %u, decode/write: %u",
-                frm_pcm.size, frm_bit.size, out_frm.size));
+        TRACE_((THIS_FILE, "%d.%03d read: %u, enc: %u, dec/write: %u",
+                T, frm_pcm.size, frm_bit.size, out_frm.size));
     }
 
@@ -238 +282 @@
         printf("Duration: %ds.%03d\n", file_msec_duration/1000, 
                                        file_msec_duration%1000);
-        printf("Time: %ds.%03d\n", t1.sec, t1.msec);
+        printf("Time: %lds.%03ld\n", t1.sec, t1.msec);
     }