diff options
| author | Nanang Izzuddin <nanang@teluu.com> | 2010-04-26 13:57:28 +0000 |
|---|---|---|
| committer | Nanang Izzuddin <nanang@teluu.com> | 2010-04-26 13:57:28 +0000 |
| commit | ab2945ae8bf290de222146fe32ada4f8199b7ab5 (patch) | |
| tree | f23bf585f97ae56d649b1a6067694ebea3ed4d92 | |
| parent | ff5d3e64975fca69faf71bf73bdcc14eccb7d7f3 (diff) | |
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).
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@3146 74dad513-b988-da41-8d7b-12977e46ad98
| -rw-r--r-- | pjmedia/include/pjmedia-codec/types.h | 10 | ||||
| -rw-r--r-- | pjmedia/include/pjmedia/codec.h | 1 | ||||
| -rw-r--r-- | pjmedia/src/pjmedia-codec/l16.c | 2 |
3 files changed, 6 insertions, 7 deletions
diff --git a/pjmedia/include/pjmedia-codec/types.h b/pjmedia/include/pjmedia-codec/types.h index f49c4ed2..b2dc41f9 100644 --- a/pjmedia/include/pjmedia-codec/types.h +++ b/pjmedia/include/pjmedia-codec/types.h @@ -63,17 +63,17 @@ enum PJMEDIA_RTP_PT_L16_16KHZ_STEREO, /**< L16 @ 16KHz, stereo */ //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) */ 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, static? */ + 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) */ diff --git a/pjmedia/include/pjmedia/codec.h b/pjmedia/include/pjmedia/codec.h index 67df9f58..07e2c168 100644 --- a/pjmedia/include/pjmedia/codec.h +++ b/pjmedia/include/pjmedia/codec.h @@ -196,7 +196,6 @@ 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/l16.c b/pjmedia/src/pjmedia-codec/l16.c index 60a7ae32..1704d2c9 100644 --- a/pjmedia/src/pjmedia-codec/l16.c +++ b/pjmedia/src/pjmedia-codec/l16.c @@ -396,7 +396,6 @@ static pj_status_t l16_enum_codecs( pjmedia_codec_factory *factory, codecs[count].channel_cnt = 2; ++count; } -#endif if (count < *max_count) { /* 32000 Hz mono */ @@ -437,6 +436,7 @@ static pj_status_t l16_enum_codecs( pjmedia_codec_factory *factory, codecs[count].channel_cnt = 2; ++count; } +#endif *max_count = count; |