From de6f74d331c26dd94db2a47f001a5d400451b57a Mon Sep 17 00:00:00 2001
From: Nanang Izzuddin <nanang@teluu.com>
Date: Fri, 15 Aug 2008 18:35:50 +0000
Subject: Ticket #583:  - rearranged some codec properties, e.g: codec name,
 enable/disable, payload type  - fixed bug VAD setting on init USC codec

git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@2218 74dad513-b988-da41-8d7b-12977e46ad98
---
 pjmedia/include/pjmedia-codec/types.h  |  6 ++----
 pjmedia/include/pjmedia/codec.h        |  1 +
 pjmedia/src/pjmedia-codec/ipp_codecs.c | 21 +++++++--------------
 3 files changed, 10 insertions(+), 18 deletions(-)

(limited to 'pjmedia')

diff --git a/pjmedia/include/pjmedia-codec/types.h b/pjmedia/include/pjmedia-codec/types.h
index 7bcad26e..32f55250 100644
--- a/pjmedia/include/pjmedia-codec/types.h
+++ b/pjmedia/include/pjmedia-codec/types.h
@@ -59,11 +59,9 @@ enum
     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_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)	    */
 };
 
 
diff --git a/pjmedia/include/pjmedia/codec.h b/pjmedia/include/pjmedia/codec.h
index 891dd547..55459f41 100644
--- a/pjmedia/include/pjmedia/codec.h
+++ b/pjmedia/include/pjmedia/codec.h
@@ -194,6 +194,7 @@ PJ_BEGIN_DECL
 enum pjmedia_rtp_pt
 {
     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			    */
     PJMEDIA_RTP_PT_DVI4_8K = 5,	    /**< audio DVI4 8KHz		    */
diff --git a/pjmedia/src/pjmedia-codec/ipp_codecs.c b/pjmedia/src/pjmedia-codec/ipp_codecs.c
index 6d8ada08..addf8cac 100644
--- a/pjmedia/src/pjmedia-codec/ipp_codecs.c
+++ b/pjmedia/src/pjmedia-codec/ipp_codecs.c
@@ -230,11 +230,11 @@ ipp_codec[] =
 #   endif
 
 #   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
     },
@@ -242,7 +242,7 @@ ipp_codec[] =
 		    32000, 32000, 2, 0, 0,
 		    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
     },
@@ -256,16 +256,8 @@ ipp_codec[] =
 #   endif
 
 #   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
     },
 #   endif
@@ -618,7 +610,8 @@ static pj_status_t ipp_codec_open( pjmedia_codec *codec,
 
     /* 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 */
 
-- 
cgit v1.2.3