Changeset 3202

Timestamp:

Jun 11, 2010 1:38:42 PM (14 years ago)

Author:

nanang

Message:

Close #1072:

• Added API pjmedia_codec_g722_set_pcm_shift() to enable configurable level-adjusment setting.
• Also added macro PJMEDIA_G722_DEFAULT_PCM_SHIFT (default value is 2) to accomplish 14-16 bit PCM conversion for G722 input/output.
• Added a feature in G722 to stop level-adjusment/PCM-shifting when clipping occured, compile-time configurable via PJMEDIA_G722_STOP_PCM_SHIFT_ON_CLIPPING macro.

Location:

pjproject/trunk/pjmedia

Files:

• include/pjmedia-codec/config.h (modified) (1 diff)
• include/pjmedia-codec/g722.h (modified) (1 diff)
• src/pjmedia-codec/g722.c (modified) (7 diffs)
• src/pjmedia-codec/g722/g722_dec.c (modified) (2 diffs)
• src/pjmedia-codec/g722/g722_enc.c (modified) (1 diff)

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

@@ -95 +95 @@
 #ifndef PJMEDIA_HAS_G722_CODEC
 #   define PJMEDIA_HAS_G722_CODEC    1
+#endif
+
+
+/**
+ * Default G.722 codec encoder and decoder level adjustment. The G.722
+ * specifies that it uses 14 bit PCM for input and output, while PJMEDIA
+ * normally uses 16 bit PCM, so the conversion is done by applying
+ * level adjustment. If the value is non-zero, then PCM input samples to
+ * the encoder will be shifted right by this value, and similarly PCM
+ * output samples from the decoder will be shifted left by this value.
+ *
+ * This can be changed at run-time after initialization by calling
+ * #pjmedia_codec_g722_set_pcm_shift().
+ *
+ * Default: 2.
+ */
+#ifndef PJMEDIA_G722_DEFAULT_PCM_SHIFT
+#   define PJMEDIA_G722_DEFAULT_PCM_SHIFT           2
+#endif
+
+
+/**
+ * Specifies whether G.722 PCM shifting should be stopped when clipping
+ * detected in the decoder. Enabling this feature can be useful when
+ * talking to G.722 implementation that uses 16 bit PCM for G.722 input/
+ * output (for any reason it seems to work) and the PCM shifting causes
+ * audio clipping.
+ *
+ * See also #PJMEDIA_G722_DEFAULT_PCM_SHIFT.
+ *
+ * Default: enabled.
+ */
+#ifndef PJMEDIA_G722_STOP_PCM_SHIFT_ON_CLIPPING
+#   define PJMEDIA_G722_STOP_PCM_SHIFT_ON_CLIPPING  1
 #endif
 

pjproject/trunk/pjmedia/include/pjmedia-codec/g722.h

@@ -79 +79 @@
 
 
+/**
+ * Set the G.722 codec encoder and decoder level adjustment.
+ * If the value is non-zero, then PCM input samples to the encoder will 
+ * be shifted right by this value, and similarly PCM output samples from
+ * the decoder will be shifted left by this value.
+ *
+ * Default value is PJMEDIA_G722_DEFAULT_PCM_SHIFT.
+ *
+ * @param val           The value
+ *
+ * @return              PJ_SUCCESS on success.
+ */
+PJ_DECL(pj_status_t) pjmedia_codec_g722_set_pcm_shift(unsigned val);
+
+
 PJ_END_DECL
 

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

@@ -134 +134 @@
     pj_mutex_t              *mutex;
     pjmedia_codec            codec_list;
+    unsigned                 pcm_shift;
 } g722_codec_factory;
 
@@ -142 +143 @@
     g722_enc_t           encoder;
     g722_dec_t           decoder;
+    unsigned             pcm_shift;
+    pj_int16_t           pcm_clip_mask;
     pj_bool_t            plc_enabled;
     pj_bool_t            vad_enabled;
@@ -168 +171 @@
     g722_codec_factory.base.factory_data = NULL;
     g722_codec_factory.endpt = endpt;
+    g722_codec_factory.pcm_shift = PJMEDIA_G722_DEFAULT_PCM_SHIFT;
 
     g722_codec_factory.pool = pjmedia_endpt_create_pool(endpt, "g722", 1000, 
@@ -240 +244 @@
     return status;
 }
+
+
+/*
+ * Set level adjustment.
+ */
+PJ_DEF(pj_status_t) pjmedia_codec_g722_set_pcm_shift(unsigned val)
+{
+    g722_codec_factory.pcm_shift = val;
+    return PJ_SUCCESS;
+}
+
 
 /* 
@@ -447 +462 @@
     g722_data->vad_enabled = (attr->setting.vad != 0);
     g722_data->plc_enabled = (attr->setting.plc != 0);
+    g722_data->pcm_shift = g722_codec_factory.pcm_shift;
+    g722_data->pcm_clip_mask = (pj_int16_t)(1<<g722_codec_factory.pcm_shift)-1;
+    g722_data->pcm_clip_mask <<= (16-g722_codec_factory.pcm_shift);
 
     TRACE_((THIS_FILE, "G722 codec opened: vad=%d, plc=%d",
@@ -566 +584 @@
     }
 
+    /* Adjust input signal level from 16-bit to 14-bit */
+    if (g722_data->pcm_shift) {
+        pj_int16_t *p, *end;
+
+        p = (pj_int16_t*)input->buf;
+        end = p + input->size;
+        while (p < end) {
+            *p++ >>= g722_data->pcm_shift;
+        }
+    }
+
     /* Encode to temporary buffer */
     output->size = output_buf_len;
@@ -624 +653 @@
 
     pj_assert(output->size == SAMPLES_PER_FRAME);
+
+    /* Adjust input signal level from 14-bit to 16-bit */
+    if (g722_data->pcm_shift) {
+        pj_int16_t *p, *end;
+
+        p = (pj_int16_t*)output->buf;
+        end = p + output->size;
+        while (p < end) {
+#if PJMEDIA_G722_STOP_PCM_SHIFT_ON_CLIPPING
+            /* If there is clipping, stop the PCM shifting */
+            if (*p & g722_data->pcm_clip_mask) {
+                g722_data->pcm_shift = 0;
+                break;
+            }
+#endif
+            *p++ <<= g722_data->pcm_shift;
+        }
+    }
+
     output->size = SAMPLES_PER_FRAME * 2;
     output->type = PJMEDIA_FRAME_TYPE_AUDIO;

pjproject/trunk/pjmedia/src/pjmedia-codec/g722/g722_dec.c

@@ -505 +505 @@
     int ilowr, ylow, rlow, dlowt;
     int ihigh, rhigh, dhigh;
-    int pcm1, pcm2;
     pj_uint8_t *in_ = (pj_uint8_t*) in;
 
@@ -530 +529 @@
         /* rhigh <= output high band pcm */
 
-        rx_qmf(dec, rlow, rhigh, &pcm1, &pcm2);
-        out[i*2] = (pj_int16_t)(pcm1 << 2);
-        out[i*2+1] = (pj_int16_t)(pcm2 << 2);
+        rx_qmf(dec, rlow, rhigh, &out[i*2], &out[i*2+1]);
     }
 

pjproject/trunk/pjmedia/src/pjmedia-codec/g722/g722_enc.c

@@ -544 +544 @@
     
     for(i = 0; i < nsamples; i += 2) {
-        tx_qmf(enc, in[i]>>2, in[i+1]>>2, &xlow, &xhigh);
+        tx_qmf(enc, in[i], in[i+1], &xlow, &xhigh);
 
         /* low band encoder */