Changeset 4348 for pjproject/trunk/pjmedia/src/pjmedia-codec/opencore_amr.c

Timestamp:

Feb 14, 2013 2:00:13 AM (12 years ago)

Author:

ming

Message:

Re #1608: Fixed array size calculation of amr bitrates array.

File:

• pjproject/trunk/pjmedia/src/pjmedia-codec/opencore_amr.c (modified) (7 diffs)

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

@@ -143 +143 @@
     &amr_alloc_codec,
     &amr_dealloc_codec,
-    &pjmedia_codec_opencore_amrnb_deinit
+    &pjmedia_codec_opencore_amr_deinit
 };
 
@@ -195 +195 @@
     {pjmedia_codec_amrnb_bitrates, pjmedia_codec_amrwb_bitrates};
 
+static const unsigned amr_bitrates_size[2] =
+{
+    PJ_ARRAY_SIZE(pjmedia_codec_amrnb_bitrates),
+    PJ_ARRAY_SIZE(pjmedia_codec_amrwb_bitrates)
+};
+
 
 /*
@@ -327 +333 @@
 
     /* Normalize bitrate. */
-    nbitrates = PJ_ARRAY_SIZE(amr_bitrates[idx]);
+    nbitrates = amr_bitrates_size[idx];
     if (def_config[idx].bitrate < amr_bitrates[idx][0]) {
         def_config[idx].bitrate = amr_bitrates[idx][0];
@@ -410 +416 @@
     attr->info.channel_cnt = 1;
     attr->info.avg_bps = def_config[idx].bitrate;
-    attr->info.max_bps = amr_bitrates[idx][PJ_ARRAY_SIZE(amr_bitrates[idx])-1];
+    attr->info.max_bps = amr_bitrates[idx][amr_bitrates_size[idx]-1];
     attr->info.pcm_bits_per_sample = 16;
     attr->info.frm_ptime = 20;
@@ -563 +569 @@
     idx = (attr->info.clock_rate <= 8000? IDX_AMR_NB: IDX_AMR_WB);
     enc_mode = pjmedia_codec_amr_get_mode(attr->info.avg_bps);
-    pj_assert(enc_mode >= 0 &&
-              enc_mode < PJ_ARRAY_SIZE(amr_bitrates[idx]));
+    pj_assert(enc_mode >= 0 && enc_mode < amr_bitrates_size[idx]);
 
     /* Check octet-align */
@@ -598 +603 @@
             l = pj_strlen(&attr->setting.enc_fmtp.param[i].val);
             while (l--) {
-                if (*p>='0' &&
-                    *p<=('0'+PJ_ARRAY_SIZE(amr_bitrates[idx])-1))
-                {
+                if (*p>='0' && *p<=('0'+amr_bitrates_size[idx]-1)) {
                     pj_int8_t tmp = *p - '0' - enc_mode;
 
@@ -776 +779 @@
 
     /* Check for Change Mode Request. */
-    if (cmr < PJ_ARRAY_SIZE(amr_bitrates[idx]) && amr_data->enc_mode != cmr) {
+    if (cmr < amr_bitrates_size[idx] && amr_data->enc_mode != cmr) {
         amr_data->enc_mode = cmr;
         TRACE_((THIS_FILE, "AMR encoder switched mode to %d (%dbps)",