Changeset 2216

Timestamp:

Aug 15, 2008 1:17:39 PM (16 years ago)

Author:

nanang

Message:

Ticket #583: Initial source of IPP codecs wrapper.

Location:

pjproject/trunk

Files:

• pjmedia/build/pjmedia_codec.dsp (modified) (2 diffs)
• pjmedia/build/pjmedia_codec.vcproj (modified) (4 diffs)
• pjmedia/include/pjmedia-codec.h (modified) (1 diff)
• pjmedia/include/pjmedia-codec/config.h (modified) (1 diff)
• pjmedia/include/pjmedia-codec/ipp_codecs.h (added)
• pjmedia/include/pjmedia-codec/types.h (modified) (1 diff)
• pjmedia/src/pjmedia-codec/ipp_codecs.c (added)
• pjsip/src/pjsua-lib/pjsua_media.c (modified) (2 diffs)

pjproject/trunk/pjmedia/build/pjmedia_codec.dsp

@@ -131 +131 @@
 # Begin Source File
 
+SOURCE="..\src\pjmedia-codec\ipp_codecs.c"
+# End Source File
+# Begin Source File
+
 SOURCE="..\src\pjmedia-codec\l16.c"
 
@@ -174 +178 @@
 
 SOURCE="..\include\pjmedia-codec\ilbc.h"
+# End Source File
+# Begin Source File
+
+SOURCE="..\include\pjmedia-codec\ipp_codecs.h"
 # End Source File
 # Begin Source File

pjproject/trunk/pjmedia/build/pjmedia_codec.vcproj

@@ -43 +43 @@
                                 Name="VCCLCompilerTool"
                                 Optimization="0"
-                                AdditionalIncludeDirectories="../include,../../pjlib/include,../../third_party/speex/include"
+                                AdditionalIncludeDirectories="../include;../../pjlib/include;../../third_party/speex/include"
                                 PreprocessorDefinitions="_DEBUG;WIN32;_LIB;PJ_WIN32=1;PJ_M_I386=1;HAVE_CONFIG_H"
                                 MinimalRebuild="true"
@@ -120 +120 @@
                                 Optimization="2"
                                 InlineFunctionExpansion="1"
-                                AdditionalIncludeDirectories="../include,../../pjlib/include,../../third_party/speex/include"
+                                AdditionalIncludeDirectories="../include;../../pjlib/include;../../third_party/speex/include;"../../../ipp-samples/speech-codecs/core/usc/include""
                                 PreprocessorDefinitions="NDEBUG;WIN32;_LIB;PJ_WIN32=1;PJ_M_I386=1;HAVE_CONFIG_H"
                                 StringPooling="true"
@@ -225 +225 @@
                         </File>
                         <File
+                                RelativePath="..\src\pjmedia-codec\ipp_codecs.c"
+                                >
+                        </File>
+                        <File
                                 RelativePath="..\src\pjmedia-codec\l16.c"
                                 >
@@ -310 +314 @@
                         </File>
                         <File
+                                RelativePath="..\include\pjmedia-codec\ipp_codecs.h"
+                                >
+                        </File>
+                        <File
                                 RelativePath="..\include\pjmedia-codec\l16.h"
                                 >

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

@@ -30 +30 @@
 #include <pjmedia-codec/ilbc.h>
 #include <pjmedia-codec/g722.h>
+#include <pjmedia-codec/ipp_codecs.h>
 
 

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

@@ -84 +84 @@
 
 
+/**
+ * IPP codecs are excluded by default. IPP codecs contain various codecs,
+ * e.g: G.729, G.723.1, G.726, G.728, G.722.1, AMR.
+ */
+#ifndef PJMEDIA_HAS_INTEL_IPP_CODECS
+#   define PJMEDIA_HAS_INTEL_IPP_CODECS         0
+#endif
+
+/**
+ * Specify IPP codecs content. If PJMEDIA_HAS_INTEL_IPP_CODECS is not set,
+ * these settings will be ignored.
+ */
+#ifndef PJMEDIA_HAS_INTEL_IPP_CODEC_AMR
+#   define PJMEDIA_HAS_INTEL_IPP_CODEC_AMR      1
+#endif
+
+#ifndef PJMEDIA_HAS_INTEL_IPP_CODEC_G729
+#   define PJMEDIA_HAS_INTEL_IPP_CODEC_G729     1
+#endif
+
+#ifndef PJMEDIA_HAS_INTEL_IPP_CODEC_G723
+#   define PJMEDIA_HAS_INTEL_IPP_CODEC_G723     1
+#endif
+
+#ifndef PJMEDIA_HAS_INTEL_IPP_CODEC_G726
+#   define PJMEDIA_HAS_INTEL_IPP_CODEC_G726     1
+#endif
+
+#ifndef PJMEDIA_HAS_INTEL_IPP_CODEC_G728
+#   define PJMEDIA_HAS_INTEL_IPP_CODEC_G728     1
+#endif
+
+#ifndef PJMEDIA_HAS_INTEL_IPP_CODEC_G722_1
+#   define PJMEDIA_HAS_INTEL_IPP_CODEC_G722_1   1
+#endif
+
+
 #endif  /* __PJMEDIA_CODEC_CONFIG_H__ */
-

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

@@ -54 +54 @@
     PJMEDIA_RTP_PT_L16_48KHZ_MONO,              /**< L16 @ 48KHz, mono      */
     PJMEDIA_RTP_PT_L16_48KHZ_STEREO,            /**< L16 @ 48KHz, stereo    */
-    PJMEDIA_RTP_PT_ILBC                         /**< iLBC (13.3/15.2Kbps)   */
+    PJMEDIA_RTP_PT_ILBC,                        /**< iLBC (13.3/15.2Kbps)   */
+    PJMEDIA_RTP_PT_AMR,                         /**< AMR (4.75 - 12.2Kbps)  */
+    PJMEDIA_RTP_PT_AMRWB,                       /**< AMRWB (6.6 - 23.85Kbps)*/
+    PJMEDIA_RTP_PT_AMRWBE,                      /**< AMRWBE                 */
+    PJMEDIA_RTP_PT_G726_16,                     /**< G726 @ 16Kbps          */
+    PJMEDIA_RTP_PT_G726_24,                     /**< G726 @ 24Kbps          */
+    PJMEDIA_RTP_PT_G726_32,                     /**< G726 @ 32Kbps          */
+    PJMEDIA_RTP_PT_G726_40,                     /**< G726 @ 40Kbps          */
+    PJMEDIA_RTP_PT_G722_1_16,                   /**< G722.1 (16Kbps)        */
+    PJMEDIA_RTP_PT_G722_1_24,                   /**< G722.1 (24Kbps)        */
+    PJMEDIA_RTP_PT_G722_1_32,                   /**< G722.1 (32Kbps)        */
 };
 

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_media.c

@@ -92 +92 @@
 
     /* Register all codecs */
+
 #if PJMEDIA_HAS_SPEEX_CODEC
     /* Register speex. */
@@ -159 +160 @@
     }
 #endif  /* PJMEDIA_HAS_G722_CODEC */
+
+#if PJMEDIA_HAS_INTEL_IPP_CODECS
+    /* Register IPP codecs */
+    status = pjmedia_codec_ipp_init(pjsua_var.med_endpt);
+    if (status != PJ_SUCCESS) {
+        pjsua_perror(THIS_FILE, "Error initializing IPP codecs",
+                     status);
+        return status;
+    }
+
+#endif /* PJMEDIA_HAS_INTEL_IPP_CODECS */
 
 #if PJMEDIA_HAS_L16_CODEC