Changeset 417 for pjproject/trunk

Timestamp:

Apr 28, 2006 2:48:02 PM (19 years ago)

Author:

bennylp

Message:

Added Packet Lost Concealment (PLC) framework, with two backend algorithms (simple replay and G.711 Appendix I)

Location:

pjproject/trunk/pjmedia

Files:

• build/Makefile (modified) (1 diff)
• build/pjmedia.dsp (modified) (2 diffs)
• include/pjmedia.h (modified) (1 diff)
• include/pjmedia/config.h (modified) (1 diff)
• include/pjmedia/plc.h (added)
• src/pjmedia/plc_common.c (added)
• src/pjmedia/plc_g711.c (added)
• src/pjmedia/sound_port.c (modified) (7 diffs)

pjproject/trunk/pjmedia/build/Makefile

@@ -67 +67 @@
                         clock_thread.o codec.o conference.o endpoint.o errno.o \
                         wav_player.o wav_writer.o g711.o jbuf.o \
-                        master_port.o null_port.o port.o resample.o \
+                        master_port.o null_port.o plc_common.o plc_g711.o \
+                        port.o resample.o \
                         resample_port.o rtcp.o rtp.o sdp.o sdp_cmp.o sdp_neg.o \
                         session.o silencedet.o sound_port.o stream.o wave.o \

pjproject/trunk/pjmedia/build/pjmedia.dsp

@@ -136 +136 @@
 # Begin Source File
 
+SOURCE=..\src\pjmedia\plc_common.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\pjmedia\plc_g711.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\src\pjmedia\port.c
 # End Source File
@@ -245 +253 @@
 
 SOURCE=..\include\pjmedia.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\pjmedia\plc.h
 # End Source File
 # Begin Source File

pjproject/trunk/pjmedia/include/pjmedia.h

@@ -35 +35 @@
 #include <pjmedia/master_port.h>
 #include <pjmedia/null_port.h>
+#include <pjmedia/plc.h>
 #include <pjmedia/port.h>
 #include <pjmedia/resample.h>

pjproject/trunk/pjmedia/include/pjmedia/config.h

@@ -118 +118 @@
 
 
+/**
+ * G.711 Appendix I Packet Lost Concealment (PLC).
+ * Enabled only when floating point is enabled.
+ */
+#ifndef PJMEDIA_HAS_G711_PLC
+#   define PJMEDIA_HAS_G711_PLC                 PJ_HAS_FLOATING_POINT
+#endif
+
+
+
 #endif  /* __PJMEDIA_CONFIG_H__ */
 

pjproject/trunk/pjmedia/src/pjmedia/sound_port.c

@@ -19 +19 @@
 #include <pjmedia/sound_port.h>
 #include <pjmedia/errno.h>
+#include <pjmedia/plc.h>
 #include <pj/assert.h>
 #include <pj/log.h>
@@ -25 +26 @@
 
 
-//#define SIMULATE_LOST_PCT   10
+//#define SIMULATE_LOST_PCT   20
 
 
@@ -35 +36 @@
 };
 
-#define DEFAULT_OPTIONS PJMEDIA_PLC_ENABLED
-
+//#define DEFAULT_OPTIONS       PJMEDIA_PLC_ENABLED
+#define DEFAULT_OPTIONS     0
 
 
@@ -48 +49 @@
     unsigned             options;
 
-    void                *last_frame;
-    unsigned             last_frame_size;
-    unsigned             last_replay_count;
+    pjmedia_plc         *plc;
 
     unsigned             clock_rate;
@@ -104 +103 @@
 #endif
 
-    /* Keep frame if PLC is enabled. */
-    if (snd_port->options & PJMEDIA_PLC_ENABLED) {
-        /* Must have the same length as last_frame_size */
-        pj_assert(frame.size == snd_port->last_frame_size);
-
-        /* Copy frame to last_frame */
-        pj_memcpy(snd_port->last_frame, output, snd_port->last_frame_size);
-
-        snd_port->last_replay_count = 0;
-    }
+    if (snd_port->plc)
+        pjmedia_plc_save(snd_port->plc, output);
 
     return PJ_SUCCESS;
@@ -119 +110 @@
 no_frame:
 
-    /* Replay last frame if PLC is enabled */
-    if ((snd_port->options & PJMEDIA_PLC_ENABLED) &&
-        snd_port->last_replay_count < 8) 
-    {
-
-        /* Must have the same length as last_frame_size */
-        pj_assert(size == snd_port->last_frame_size);
-
-        /* Replay last frame */
-        pj_memcpy(output, snd_port->last_frame, snd_port->last_frame_size);
-
-        /* Reduce replay frame signal level to half */
-        if (snd_port->bits_per_sample == 16) {
-            unsigned i, count;
-            pj_int16_t *samp;
-
-            count = snd_port->last_frame_size / 2;
-            samp = (pj_int16_t *) snd_port->last_frame;
-
-            for (i=0; i<count; ++i)
-                samp[i] = (pj_int16_t) (samp[i] >> 2);
-
-        }
-
+    /* Apply PLC */
+    if (snd_port->plc) {
+
+        pjmedia_plc_generate(snd_port->plc, output);
 #ifdef SIMULATE_LOST_PCT
-        PJ_LOG(4,(THIS_FILE, "Frame replayed"));
+        PJ_LOG(4,(THIS_FILE, "Lost frame generated"));
 #endif
-
-        ++snd_port->last_replay_count;
-
-    } else {
-
-        /* Just zero the frame */
-        pj_memset(output, 0, size);
-
     }
 
@@ -255 +218 @@
         (snd_port->options & PJMEDIA_PLC_ENABLED)) 
     {
-
-        snd_port->last_frame_size = snd_port->samples_per_frame *
-                                    snd_port->channel_count *
-                                    snd_port->bits_per_sample / 8;
-        snd_port->last_frame = pj_pool_zalloc(pool, 
-                                              snd_port->last_frame_size);
+        status = pjmedia_plc_create(pool, snd_port->clock_rate, 
+                                    snd_port->samples_per_frame * 
+                                        snd_port->channel_count,
+                                    0, &snd_port->plc);
+        if (status != PJ_SUCCESS)
+            snd_port->plc = NULL;
     }