Changeset 3263

Timestamp:

Aug 11, 2010 7:18:08 AM (14 years ago)

Author:

nanang

Message:

Re #1106: Reverted back the IPP codec APIs pjmedia_codec_ipp_set/get_config() as currently to set PCM signal level adjustment can be done using the existing G722.1 API pjmedia_codec_g7221_set_pcm_shift().

Location:

pjproject/trunk/pjmedia

Files:

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

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

@@ -130 +130 @@
  * the decoder will be shifted left by this value.
  *
+ * \note
+ * This function is also applicable for G722.1 implementation with IPP
+ * back-end.
+ *
  * Default value is PJMEDIA_G7221_DEFAULT_PCM_SHIFT.
  *

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;
-
 
 /**
@@ -318 +301 @@
  */
 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

@@ -645 +645 @@
 }
 
+
+#include <pjmedia-codec/g7221.h>
+
+
+PJ_DEF(pj_status_t) pjmedia_codec_g7221_set_pcm_shift(int val)
+{
+    PJ_ASSERT_RETURN(val >= 0, PJ_EINVAL);
+
+    ipp_factory.g7221_pcm_shift = val;
+    return PJ_SUCCESS;
+}
+
+
 #endif /* PJMEDIA_HAS_INTEL_IPP_CODEC_G722_1 */
 
@@ -733 +746 @@
 
     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;
 }