Changeset 2218

Timestamp:

Aug 15, 2008 6:35:50 PM (16 years ago)

Author:

nanang

Message:

Ticket #583:

• rearranged some codec properties, e.g: codec name, enable/disable, payload type
• fixed bug VAD setting on init USC codec

Location:

pjproject/trunk/pjmedia

Files:

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

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

@@ -60 +60 @@
     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_32,*/                /**< G726 @ 32Kbps, static? */
     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)        */
+    PJMEDIA_RTP_PT_G722_1,                      /**< G722.1 (16-32Kbps)     */
 };
 

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

@@ -195 +195 @@
 {
     PJMEDIA_RTP_PT_PCMU = 0,        /**< audio PCMU                         */
+    PJMEDIA_RTP_PT_G726_32 = 2,    /**< audio G726-32                       */
     PJMEDIA_RTP_PT_GSM  = 3,        /**< audio GSM                          */
     PJMEDIA_RTP_PT_G723 = 4,        /**< audio G723                         */

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

@@ -231 +231 @@
 
 #   if defined(PJMEDIA_HAS_INTEL_IPP_CODEC_G726) && PJMEDIA_HAS_INTEL_IPP_CODEC_G726 != 0
-    {1, "G726-16",  PJMEDIA_RTP_PT_G726_16,   &USC_G726_Fxns,    8000, 1,  80, 
+    {0, "G726-16",  PJMEDIA_RTP_PT_G726_16,   &USC_G726_Fxns,    8000, 1,  80, 
                     16000, 16000, 2, 0, 0,
                     NULL, NULL, NULL
     },
-    {1, "G726-24",  PJMEDIA_RTP_PT_G726_24,   &USC_G726_Fxns,    8000, 1,  80, 
+    {0, "G726-24",  PJMEDIA_RTP_PT_G726_24,   &USC_G726_Fxns,    8000, 1,  80, 
                     24000, 24000, 2, 0, 0,
                     NULL, NULL, NULL
@@ -243 +243 @@
                     NULL, NULL, NULL
     },
-    {1, "G726-40",  PJMEDIA_RTP_PT_G726_40,   &USC_G726_Fxns,    8000, 1,  80, 
+    {0, "G726-40",  PJMEDIA_RTP_PT_G726_40,   &USC_G726_Fxns,    8000, 1,  80, 
                     40000, 40000, 2, 0, 0,
                     NULL, NULL, NULL
@@ -257 +257 @@
 
 #   if defined(PJMEDIA_HAS_INTEL_IPP_CODEC_G722_1) && PJMEDIA_HAS_INTEL_IPP_CODEC_G722_1 != 0
-    {1, "G722.1-16",PJMEDIA_RTP_PT_G722_1_16, &USC_G722_Fxns,   16000, 1, 320, 
-                    16000, 16000, 1, 0, 1,
-                    NULL, NULL, NULL
-    },
-    {0, "G722.1-24",PJMEDIA_RTP_PT_G722_1_24, &USC_G722_Fxns,   16000, 1, 320, 
-                    24000, 24000, 1, 0, 1,
-                    NULL, NULL, NULL
-    },
-    {0, "G722.1-32",PJMEDIA_RTP_PT_G722_1_32, &USC_G722_Fxns,   16000, 1, 320, 
-                    32000, 32000, 1, 0, 0,
+    {0, "G7221",    PJMEDIA_RTP_PT_G722_1,    &USC_G722_Fxns,   16000, 1, 320, 
+                    24000, 32000, 1, 0, 1,
                     NULL, NULL, NULL
     },
@@ -619 +611 @@
     /* Setting the encoder params */
     codec_data->info->params.direction = USC_ENCODE;
-    codec_data->info->params.modes.vad = attr->setting.vad;
+    codec_data->info->params.modes.vad = attr->setting.vad && 
+                                ipp_codec[codec_data->codec_idx].has_native_vad;
     codec_data->info->params.modes.bitrate = attr->info.avg_bps;
     codec_data->info->params.law = 0; /* Linear PCM input */