Changeset 4002


Ignore:
Timestamp:
Mar 30, 2012 8:05:43 AM (7 years ago)
Author:
bennylp
Message:

Re #1474: merged r3879

Location:
pjproject/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk

  • pjproject/trunk/pjmedia/src/pjmedia-codec/ipp_codecs.c

    r3911 r4002  
    251251#   if PJMEDIA_HAS_INTEL_IPP_CODEC_AMRWB 
    252252    {1, "AMR-WB",   PJMEDIA_RTP_PT_AMRWB,     &USC_AMRWB_Fxns,  16000, 1, 320, 
    253                     15850, 23850, 1, 1, 1,  
     253                    15850, 23850, 2, 1, 1,  
    254254                    &predecode_amr, &parse_amr, &pack_amr, 
    255255                    {1, {{{"octet-align", 11}, {"1", 1}}} } 
     
    513513    pj_uint8_t SID_FT; 
    514514    pjmedia_codec_amr_pack_setting *setting; 
     515    const pj_uint8_t *framelen_tbl; 
    515516 
    516517    setting = &((amr_settings_t*)codec_data->codec_setting)->enc_setting; 
     518    framelen_tbl = setting->amr_nb? pjmedia_codec_amrnb_framelen: 
     519                                    pjmedia_codec_amrwb_framelen; 
    517520 
    518521    SID_FT = (pj_uint8_t)(setting->amr_nb? 8 : 9); 
     
    539542        frames[nframes].buf = r + 2; 
    540543        frames[nframes].size = info->frame_type <= SID_FT ? 
    541                                pjmedia_codec_amrnb_framelen[info->frame_type] : 
    542                                0; 
     544                               framelen_tbl[info->frame_type] : 0; 
    543545 
    544546        r += frames[nframes].size + 2; 
Note: See TracChangeset for help on using the changeset viewer.