diff options
| author | Benny Prijono <bennylp@teluu.com> | 2012-03-30 08:05:43 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2012-03-30 08:05:43 +0000 |
| commit | 4104a374e7dcf0aaa30dbfbd4195c9b2444c8e58 (patch) | |
| tree | 4ab6f20d3f235eca667a32d44db970c3b37c836b | |
| parent | b9952b5ebc91d708e8600864efdbda66d84f09c9 (diff) | |
Re #1474: merged r3879
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4002 74dad513-b988-da41-8d7b-12977e46ad98
| -rw-r--r-- | pjmedia/src/pjmedia-codec/ipp_codecs.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pjmedia/src/pjmedia-codec/ipp_codecs.c b/pjmedia/src/pjmedia-codec/ipp_codecs.c index 8072e6ce..d7b3344b 100644 --- a/pjmedia/src/pjmedia-codec/ipp_codecs.c +++ b/pjmedia/src/pjmedia-codec/ipp_codecs.c @@ -250,7 +250,7 @@ ipp_codec[] = # if PJMEDIA_HAS_INTEL_IPP_CODEC_AMRWB {1, "AMR-WB", PJMEDIA_RTP_PT_AMRWB, &USC_AMRWB_Fxns, 16000, 1, 320, - 15850, 23850, 1, 1, 1, + 15850, 23850, 2, 1, 1, &predecode_amr, &parse_amr, &pack_amr, {1, {{{"octet-align", 11}, {"1", 1}}} } }, @@ -512,8 +512,11 @@ static pj_status_t pack_amr(ipp_private_t *codec_data, void *pkt, pj_uint8_t *r; /* Read cursor */ pj_uint8_t SID_FT; pjmedia_codec_amr_pack_setting *setting; + const pj_uint8_t *framelen_tbl; setting = &((amr_settings_t*)codec_data->codec_setting)->enc_setting; + framelen_tbl = setting->amr_nb? pjmedia_codec_amrnb_framelen: + pjmedia_codec_amrwb_framelen; SID_FT = (pj_uint8_t)(setting->amr_nb? 8 : 9); @@ -538,8 +541,7 @@ static pj_status_t pack_amr(ipp_private_t *codec_data, void *pkt, frames[nframes].buf = r + 2; frames[nframes].size = info->frame_type <= SID_FT ? - pjmedia_codec_amrnb_framelen[info->frame_type] : - 0; + framelen_tbl[info->frame_type] : 0; r += frames[nframes].size + 2; |