Changeset 3146 for pjproject/trunk

Timestamp:

Apr 26, 2010 1:57:28 PM (15 years ago)

Author:

nanang

Message:

Misc #1026: moved payload type of G726-32 from static (was 2) to dynamic, and also disabled some more L16 codecs (thanks Bram Kuijvenhoven for the report).

Location:

pjproject/trunk/pjmedia

Files:

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

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

@@ -64 +64 @@
     //PJMEDIA_RTP_PT_L16_22KHZ_MONO,            /**< L16 @ 22KHz, mono      */
     //PJMEDIA_RTP_PT_L16_22KHZ_STEREO,          /**< L16 @ 22KHz, stereo    */
-    PJMEDIA_RTP_PT_L16_32KHZ_MONO,              /**< L16 @ 32KHz, mono      */
-    PJMEDIA_RTP_PT_L16_32KHZ_STEREO,            /**< L16 @ 32KHz, stereo    */
-    PJMEDIA_RTP_PT_L16_48KHZ_MONO,              /**< L16 @ 48KHz, mono      */
-    PJMEDIA_RTP_PT_L16_48KHZ_STEREO,            /**< L16 @ 48KHz, stereo    */
+    //PJMEDIA_RTP_PT_L16_32KHZ_MONO,            /**< L16 @ 32KHz, mono      */
+    //PJMEDIA_RTP_PT_L16_32KHZ_STEREO,          /**< L16 @ 32KHz, stereo    */
+    //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_AMR,                         /**< AMR (4.75 - 12.2Kbps)  */
@@ -74 +74 @@
     PJMEDIA_RTP_PT_G726_16,                     /**< G726 @ 16Kbps          */
     PJMEDIA_RTP_PT_G726_24,                     /**< G726 @ 24Kbps          */
-    /* PJMEDIA_RTP_PT_G726_32,*/                /**< G726 @ 32Kbps, static? */
+    PJMEDIA_RTP_PT_G726_32,                     /**< G726 @ 32Kbps          */
     PJMEDIA_RTP_PT_G726_40,                     /**< G726 @ 40Kbps          */
     PJMEDIA_RTP_PT_G722_1_16,                   /**< G722.1 (16Kbps)        */

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

@@ -197 +197 @@
 {
     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/l16.c

@@ -397 +397 @@
         ++count;
     }
-#endif
 
     if (count < *max_count) {
@@ -438 +437 @@
         ++count;
     }
+#endif