diff options
| author | Nanang Izzuddin <nanang@teluu.com> | 2010-06-07 05:23:56 +0000 |
|---|---|---|
| committer | Nanang Izzuddin <nanang@teluu.com> | 2010-06-07 05:23:56 +0000 |
| commit | 73f038dedad16a95533a146b9024514a8fc83591 (patch) | |
| tree | 203e799a0cf0ce2287eebfbc3c0805d89ef84a30 /pjmedia | |
| parent | 01483432d459b7fe5637929328a701e0c3f4fdd8 (diff) | |
Fix #1085:
- Added new codec G721, as alias for G726-32.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@3199 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjmedia')
| -rw-r--r-- | pjmedia/include/pjmedia/codec.h | 1 | ||||
| -rw-r--r-- | pjmedia/src/pjmedia-codec/ipp_codecs.c | 8 |
2 files changed, 8 insertions, 1 deletions
diff --git a/pjmedia/include/pjmedia/codec.h b/pjmedia/include/pjmedia/codec.h index 07e2c168..321527a6 100644 --- a/pjmedia/include/pjmedia/codec.h +++ b/pjmedia/include/pjmedia/codec.h @@ -196,6 +196,7 @@ PJ_BEGIN_DECL enum pjmedia_rtp_pt { PJMEDIA_RTP_PT_PCMU = 0, /**< audio PCMU */ + PJMEDIA_RTP_PT_G721 = 2, /**< audio G721 (old def for 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 0702f521..54f560e6 100644 --- a/pjmedia/src/pjmedia-codec/ipp_codecs.c +++ b/pjmedia/src/pjmedia-codec/ipp_codecs.c @@ -289,6 +289,11 @@ ipp_codec[] = 40000, 40000, 2, 0, 0, NULL, NULL, NULL }, + /* Old definition of G726-32 */ + {1, "G721", PJMEDIA_RTP_PT_G721, &USC_G726_Fxns, 8000, 1, 80, + 32000, 32000, 2, 0, 0, + NULL, NULL, NULL + }, # endif # if PJMEDIA_HAS_INTEL_IPP_CODEC_G728 @@ -1498,7 +1503,8 @@ static pj_status_t ipp_codec_decode( pjmedia_codec *codec, #if PJMEDIA_HAS_INTEL_IPP_CODEC_G726 /* For G.726: amplify decoding result (USC G.726 encoder deamplified it) */ if (pt == PJMEDIA_RTP_PT_G726_16 || pt == PJMEDIA_RTP_PT_G726_24 || - pt == PJMEDIA_RTP_PT_G726_32 || pt == PJMEDIA_RTP_PT_G726_40) + pt == PJMEDIA_RTP_PT_G726_32 || pt == PJMEDIA_RTP_PT_G726_40 || + pt == PJMEDIA_RTP_PT_G721) { unsigned i; pj_int16_t *s = (pj_int16_t*)output->buf; |