Changeset 3261 for pjproject

Timestamp:

Aug 10, 2010 3:06:40 PM (14 years ago)

Author:

nanang

Message:

Fix #1106:

• Added PCM signal adjustment in IPP G722.1 implementation. The default setting is configurable via (the existing compile-time config) PJMEDIA_G7221_DEFAULT_PCM_SHIFT.
• Added new APIs to get and set IPP codecs settings: pjmedia_codec_ipp_set/get_config(). At run-time, the G722.1 PCM signal adjustment setting can be set using these functions.

Location:

pjproject/trunk/pjmedia

Files:

• include/pjmedia-codec/ipp_codecs.h (modified) (2 diffs)
• src/pjmedia-codec/ipp_codecs.c (modified) (7 diffs)

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

@@ -292 +292 @@
 PJ_BEGIN_DECL
 
+/** 
+ * IPP codecs configuration settings.
+ */
+typedef struct pjmedia_codec_ipp_config
+{
+    /**
+     * Specifies the G.722.1 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_G7221_DEFAULT_PCM_SHIFT.
+     */
+    unsigned             g7221_pcm_shift;
+
+} pjmedia_codec_ipp_config;
+
+
 /**
  * Initialize and register IPP codecs factory to pjmedia endpoint.
@@ -301 +319 @@
 PJ_DECL(pj_status_t) pjmedia_codec_ipp_init( pjmedia_endpt *endpt );
 
+
+/**
+ * Get current IPP codecs configuration settings.
+ *
+ * @param cfg       The IPP codecs configuration settings buffer.
+ *
+ * @return          PJ_SUCCESS on success.
+ */
+PJ_DECL(pj_status_t) pjmedia_codec_ipp_get_config(
+                                pjmedia_codec_ipp_config *cfg);
+
+
+/**
+ * Set IPP codecs configuration settings.
+ *
+ * @param setting   The IPP codecs configuration settings to be applied.
+ *
+ * @return          PJ_SUCCESS on success.
+ */
+PJ_DECL(pj_status_t) pjmedia_codec_ipp_set_config(
+                                const pjmedia_codec_ipp_config *cfg);
 
 

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

@@ -113 +113 @@
     pj_pool_t               *pool;
     pj_mutex_t              *mutex;
+    unsigned                 g7221_pcm_shift;
 } ipp_factory;
 
@@ -134 +135 @@
                                                  codec has internal VAD.    */
     pj_timestamp         last_tx;           /**< Timestamp of last transmit.*/
+
+    unsigned             g7221_pcm_shift;   /**< G722.1 PCM level adjustment*/
 } ipp_private_t;
 
@@ -661 +664 @@
     ipp_factory.base.factory_data = NULL;
     ipp_factory.endpt = endpt;
+    ipp_factory.g7221_pcm_shift = PJMEDIA_G7221_DEFAULT_PCM_SHIFT;
 
     ipp_factory.pool = pjmedia_endpt_create_pool(endpt, "IPP codecs", 4000, 4000);
@@ -730 +734 @@
     return status;
 }
+
+/*
+ * Get current IPP codecs configuration settings.
+ */
+PJ_DEF(pj_status_t) pjmedia_codec_ipp_get_config(
+                                pjmedia_codec_ipp_config *cfg)
+{
+    PJ_ASSERT_RETURN(cfg, PJ_EINVAL);
+
+    pj_bzero(cfg, sizeof(*cfg));
+    cfg->g7221_pcm_shift = ipp_factory.g7221_pcm_shift;
+
+    return PJ_SUCCESS;
+}
+
+
+/*
+ * Set IPP codecs configuration settings.
+ */
+PJ_DECL(pj_status_t) pjmedia_codec_ipp_set_config(
+                                const pjmedia_codec_ipp_config *cfg)
+{
+    PJ_ASSERT_RETURN(cfg, PJ_EINVAL);
+
+    ipp_factory.g7221_pcm_shift = cfg->g7221_pcm_shift;
+    
+    return PJ_SUCCESS;
+}
+
 
 /* 
@@ -1209 +1242 @@
 #endif
 
+#if PJMEDIA_HAS_INTEL_IPP_CODEC_G722_1
+    if (ippc->pt >= PJMEDIA_RTP_PT_G722_1_16 && 
+        ippc->pt <= PJMEDIA_RTP_PT_G7221_RSV2)
+    {
+        codec_data->g7221_pcm_shift = ipp_factory.g7221_pcm_shift;
+    }
+#endif
+
     return PJ_SUCCESS;
 
@@ -1362 +1403 @@
         if (pt == PJMEDIA_RTP_PT_AMR || pt == PJMEDIA_RTP_PT_AMRWB) {
             out.pBuffer += 2;
+        }
+#endif
+
+#if PJMEDIA_HAS_INTEL_IPP_CODEC_G722_1
+        /* For G722.1: adjust the encoder input signal level */
+        if (pt >= PJMEDIA_RTP_PT_G722_1_16 && 
+            pt <= PJMEDIA_RTP_PT_G7221_RSV2 &&
+            codec_data->g7221_pcm_shift)
+        {
+            unsigned i;
+            for (i = 0; i < samples_per_frame; ++i)
+                pcm_in[i] >>= codec_data->g7221_pcm_shift;
         }
 #endif
@@ -1515 +1568 @@
 #endif
 
+#if PJMEDIA_HAS_INTEL_IPP_CODEC_G722_1
+    /* For G722.1: adjust the decoder output signal level */
+    if (pt >= PJMEDIA_RTP_PT_G722_1_16 && 
+        pt <= PJMEDIA_RTP_PT_G7221_RSV2 &&
+        codec_data->g7221_pcm_shift)
+    {
+        unsigned i;
+        pj_int16_t *s = (pj_int16_t*)output->buf;
+
+        for (i = 0; i < samples_per_frame; ++i)
+            s[i] <<= codec_data->g7221_pcm_shift;
+    }
+#endif
+
     output->type = PJMEDIA_FRAME_TYPE_AUDIO;
     output->size = samples_per_frame << 1;