Changeset 3879


Ignore:
Timestamp:
Oct 31, 2011 3:48:15 PM (7 years ago)
Author:
nanang
Message:

Fix #1410:

  • Fixed bug in ipp_codecs.c pack_amr() in setting up AMR-WB frame size, i.e: using AMR-NB frame size table instead of AMR-WB's.
  • Updated AMR-WB default setting to use two frames-per-packet.
File:
1 edited

Legend:

Unmodified
Added
Removed
  • pjproject/branches/1.x/pjmedia/src/pjmedia-codec/ipp_codecs.c

    r3845 r3879  
    248248#   if PJMEDIA_HAS_INTEL_IPP_CODEC_AMRWB 
    249249    {1, "AMR-WB",   PJMEDIA_RTP_PT_AMRWB,     &USC_AMRWB_Fxns,  16000, 1, 320, 
    250                     15850, 23850, 1, 1, 1,  
     250                    15850, 23850, 2, 1, 1,  
    251251                    &predecode_amr, &parse_amr, &pack_amr, 
    252252                    {1, {{{"octet-align", 11}, {"1", 1}}} } 
     
    510510    pj_uint8_t SID_FT; 
    511511    pjmedia_codec_amr_pack_setting *setting; 
     512    const pj_uint8_t *framelen_tbl; 
    512513 
    513514    setting = &((amr_settings_t*)codec_data->codec_setting)->enc_setting; 
     515    framelen_tbl = setting->amr_nb? pjmedia_codec_amrnb_framelen: 
     516                                    pjmedia_codec_amrwb_framelen; 
    514517 
    515518    SID_FT = (pj_uint8_t)(setting->amr_nb? 8 : 9); 
     
    536539        frames[nframes].buf = r + 2; 
    537540        frames[nframes].size = info->frame_type <= SID_FT ? 
    538                                pjmedia_codec_amrnb_framelen[info->frame_type] : 
    539                                0; 
     541                               framelen_tbl[info->frame_type] : 0; 
    540542 
    541543        r += frames[nframes].size + 2; 
Note: See TracChangeset for help on using the changeset viewer.