Changeset 4002 for pjproject/trunk

Timestamp:

Mar 30, 2012 8:05:43 AM (13 years ago)

Author:

bennylp

Message:

Re #1474: merged r3879

Location:

pjproject/trunk

Files:

• . (modified) (1 prop)
• pjmedia/src/pjmedia-codec/ipp_codecs.c (modified) (3 diffs)

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

@@ -251 +251 @@
 #   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}}} }
@@ -513 +513 @@
     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);
@@ -539 +542 @@
         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;