Aligned encoder with the latest changes in common directory (#78)

[x] Tests done: Smoke test

1 files changed, 51 insertions, 51 deletions

diff --git a/encoder/ixheaace_api.c b/encoder/ixheaace_api.c
index fd86846..92c24d5 100644
--- a/encoder/ixheaace_api.c
+++ b/encoder/ixheaace_api.c
@@ -140,7 +140,7 @@
 
 static WORD32 iusace_scratch_size(VOID) {
   WORD32 scr_size;
-  scr_size = IXHEAACE_GET_SIZE_ALIGNED(USACE_MAX_SCR_SIZE, BYTE_ALIGN_8);
+  scr_size = IXHEAAC_GET_SIZE_ALIGNED(USACE_MAX_SCR_SIZE, BYTE_ALIGN_8);
   return scr_size;
 }
 
@@ -148,39 +148,39 @@ static WORD32 iusace_calc_pers_buf_sizes(ixheaace_api_struct *pstr_api_struct) {
   WORD32 pers_size = 0;
   ia_usac_encoder_config_struct *pstr_config = &pstr_api_struct->config[0].usac_config;
 
-  pers_size += IXHEAACE_GET_SIZE_ALIGNED(pstr_config->channels * sizeof(FLOAT32 *), BYTE_ALIGN_8);
-  pers_size += IXHEAACE_GET_SIZE_ALIGNED(pstr_config->channels * sizeof(FLOAT32 *), BYTE_ALIGN_8);
-  pers_size += IXHEAACE_GET_SIZE_ALIGNED(pstr_config->channels * sizeof(FLOAT32 *), BYTE_ALIGN_8);
-  pers_size += IXHEAACE_GET_SIZE_ALIGNED(pstr_config->channels * sizeof(FLOAT32 *), BYTE_ALIGN_8);
+  pers_size += IXHEAAC_GET_SIZE_ALIGNED(pstr_config->channels * sizeof(FLOAT32 *), BYTE_ALIGN_8);
+  pers_size += IXHEAAC_GET_SIZE_ALIGNED(pstr_config->channels * sizeof(FLOAT32 *), BYTE_ALIGN_8);
+  pers_size += IXHEAAC_GET_SIZE_ALIGNED(pstr_config->channels * sizeof(FLOAT32 *), BYTE_ALIGN_8);
+  pers_size += IXHEAAC_GET_SIZE_ALIGNED(pstr_config->channels * sizeof(FLOAT32 *), BYTE_ALIGN_8);
 
   pers_size +=
-      (IXHEAACE_GET_SIZE_ALIGNED((2 * pstr_config->ccfl * sizeof(FLOAT32)), BYTE_ALIGN_8) *
+      (IXHEAAC_GET_SIZE_ALIGNED((2 * pstr_config->ccfl * sizeof(FLOAT32)), BYTE_ALIGN_8) *
        pstr_config->channels);
-  pers_size += (IXHEAACE_GET_SIZE_ALIGNED((2 * pstr_config->drc_frame_size * sizeof(FLOAT32)),
+  pers_size += (IXHEAAC_GET_SIZE_ALIGNED((2 * pstr_config->drc_frame_size * sizeof(FLOAT32)),
                                           BYTE_ALIGN_8) *
                 pstr_config->channels);
 
   pers_size +=
-      (IXHEAACE_GET_SIZE_ALIGNED((2 * pstr_config->ccfl * sizeof(FLOAT64)), BYTE_ALIGN_8) *
+      (IXHEAAC_GET_SIZE_ALIGNED((2 * pstr_config->ccfl * sizeof(FLOAT64)), BYTE_ALIGN_8) *
        pstr_config->channels);
 
-  pers_size += (IXHEAACE_GET_SIZE_ALIGNED((pstr_config->ccfl * sizeof(FLOAT64)), BYTE_ALIGN_8) *
+  pers_size += (IXHEAAC_GET_SIZE_ALIGNED((pstr_config->ccfl * sizeof(FLOAT64)), BYTE_ALIGN_8) *
                 pstr_config->channels);
 
   pers_size +=
-      (IXHEAACE_GET_SIZE_ALIGNED((2 * pstr_config->ccfl * sizeof(FLOAT64)), BYTE_ALIGN_8) *
+      (IXHEAAC_GET_SIZE_ALIGNED((2 * pstr_config->ccfl * sizeof(FLOAT64)), BYTE_ALIGN_8) *
        pstr_config->channels);
 
   pers_size +=
-      (IXHEAACE_GET_SIZE_ALIGNED((3 * pstr_config->ccfl * sizeof(FLOAT64)), BYTE_ALIGN_8) *
+      (IXHEAAC_GET_SIZE_ALIGNED((3 * pstr_config->ccfl * sizeof(FLOAT64)), BYTE_ALIGN_8) *
        pstr_config->channels);
 
   if (pstr_config->tns_select != 0) {
     pers_size +=
-        (IXHEAACE_GET_SIZE_ALIGNED(sizeof(ia_tns_info), BYTE_ALIGN_8) * pstr_config->channels);
+        (IXHEAAC_GET_SIZE_ALIGNED(sizeof(ia_tns_info), BYTE_ALIGN_8) * pstr_config->channels);
   }
 
-  pers_size += (IXHEAACE_GET_SIZE_ALIGNED(sizeof(ia_usac_td_encoder_struct), BYTE_ALIGN_8) *
+  pers_size += (IXHEAAC_GET_SIZE_ALIGNED(sizeof(ia_usac_td_encoder_struct), BYTE_ALIGN_8) *
                 pstr_config->channels);
   return pers_size;
 }
@@ -1148,7 +1148,7 @@ static VOID ixheaace_fill_mem_tabs(ixheaace_api_struct *pstr_api_struct, WORD32
       pstr_mem_info = &pstr_api_struct->pstr_mem_info[IA_ENHAACPLUSENC_PERSIST_IDX];
       {
         pstr_mem_info->ui_size =
-            IXHEAACE_GET_SIZE_ALIGNED(sizeof(ixheaace_state_struct), BYTE_ALIGN_8) +
+            IXHEAAC_GET_SIZE_ALIGNED(sizeof(ixheaace_state_struct), BYTE_ALIGN_8) +
             iusace_calc_pers_buf_sizes(pstr_api_struct);
         if (pstr_api_struct->config[0].usac_config.sbr_enable) {
           pstr_mem_info->ui_size += ixheaace_sbr_enc_pers_size(
@@ -1160,30 +1160,30 @@ static VOID ixheaace_fill_mem_tabs(ixheaace_api_struct *pstr_api_struct, WORD32
                           sizeof(pstr_api_struct->pstr_state->inp_delay[0]),
                           pstr_api_struct->config[0].use_mps) *
                       pstr_api_struct->config[0].num_bs_elements;
-        pstr_mem_info->ui_size += IXHEAACE_GET_SIZE_ALIGNED(offset_size, BYTE_ALIGN_8);
+        pstr_mem_info->ui_size += IXHEAAC_GET_SIZE_ALIGNED(offset_size, BYTE_ALIGN_8);
 
         if (pstr_api_struct->config[0].use_mps) {
           offset_size =
               (MAX_INPUT_SAMPLES) * sizeof(pstr_api_struct->pstr_state->time_signal_mps[0]);
-          pstr_mem_info->ui_size += IXHEAACE_GET_SIZE_ALIGNED(offset_size, BYTE_ALIGN_8);
+          pstr_mem_info->ui_size += IXHEAAC_GET_SIZE_ALIGNED(offset_size, BYTE_ALIGN_8);
 
           offset_size =
               (MAX_MPS_BS_PAYLOAD_SIZE) * sizeof(pstr_api_struct->pstr_state->mps_bs[0]);
-          pstr_mem_info->ui_size += IXHEAACE_GET_SIZE_ALIGNED(offset_size, BYTE_ALIGN_8);
+          pstr_mem_info->ui_size += IXHEAAC_GET_SIZE_ALIGNED(offset_size, BYTE_ALIGN_8);
 
           pstr_mem_info->ui_size +=
-              IXHEAACE_GET_SIZE_ALIGNED(sizeof(ixheaace_mps_212_memory_struct), BYTE_ALIGN_8);
+              IXHEAAC_GET_SIZE_ALIGNED(sizeof(ixheaace_mps_212_memory_struct), BYTE_ALIGN_8);
         }
         if (1 == pstr_api_struct->config[0].usac_config.sbr_enable) {
           offset_size =
               (MAX_FRAME_LEN * (1 << fac_downsample) + MAX_DS_8_1_FILTER_DELAY + INPUT_DELAY) *
               MAX_CHANNELS * sizeof(pstr_mem_info->ui_size);
-          pstr_mem_info->ui_size += IXHEAACE_GET_SIZE_ALIGNED(offset_size, BYTE_ALIGN_8);
+          pstr_mem_info->ui_size += IXHEAAC_GET_SIZE_ALIGNED(offset_size, BYTE_ALIGN_8);
         }
         if ((2 != pstr_api_struct->config[0].usac_config.channels) &&
             (1 == pstr_api_struct->config[0].usac_config.sbr_enable)) {
           offset_size = (MAX_INPUT_SAMPLES) * sizeof(pstr_api_struct->pstr_state->time_signal[0]);
-          pstr_mem_info->ui_size += IXHEAACE_GET_SIZE_ALIGNED(offset_size, BYTE_ALIGN_8);
+          pstr_mem_info->ui_size += IXHEAAC_GET_SIZE_ALIGNED(offset_size, BYTE_ALIGN_8);
         }
       }
 
@@ -1274,7 +1274,7 @@ static VOID ixheaace_fill_mem_tabs(ixheaace_api_struct *pstr_api_struct, WORD32
                                    ? 1
                                    : pstr_api_struct->config[0].chmode_nchannels);
           pstr_mem_info->ui_size =
-              IXHEAACE_GET_SIZE_ALIGNED(sizeof(ixheaace_state_struct), BYTE_ALIGN_8) +
+              IXHEAAC_GET_SIZE_ALIGNED(sizeof(ixheaace_state_struct), BYTE_ALIGN_8) +
               ia_enhaacplus_enc_aac_enc_pers_size(num_channel, aot);
           if (pstr_api_struct->config[0].aot != AOT_AAC_LC &&
               pstr_api_struct->config[0].aot != AOT_AAC_LD) {
@@ -1286,16 +1286,16 @@ static VOID ixheaace_fill_mem_tabs(ixheaace_api_struct *pstr_api_struct, WORD32
                             sizeof(pstr_api_struct->pstr_state->inp_delay[0]),
                             pstr_api_struct->config[0].use_mps) *
                         pstr_api_struct->config[0].num_bs_elements;
-          pstr_mem_info->ui_size += IXHEAACE_GET_SIZE_ALIGNED(offset_size, BYTE_ALIGN_8);
+          pstr_mem_info->ui_size += IXHEAAC_GET_SIZE_ALIGNED(offset_size, BYTE_ALIGN_8);
         }
         if (pstr_api_struct->config[0].num_bs_elements > 1) {
-          offset_size = IXHEAACE_GET_SIZE_ALIGNED(sizeof(ixheaace_state_struct), BYTE_ALIGN_8) +
+          offset_size = IXHEAAC_GET_SIZE_ALIGNED(sizeof(ixheaace_state_struct), BYTE_ALIGN_8) +
                         ia_enhaacplus_enc_sizeof_delay_buffer(
                             pstr_api_struct->config[0].aac_config.flag_framelength_small, aot, 3,
                             sizeof(pstr_api_struct->pstr_state->inp_delay[0]),
                             pstr_api_struct->config[0].use_mps) *
                             pstr_api_struct->config[0].num_bs_elements;
-          pstr_mem_info->ui_size += IXHEAACE_GET_SIZE_ALIGNED(offset_size, BYTE_ALIGN_8);
+          pstr_mem_info->ui_size += IXHEAAC_GET_SIZE_ALIGNED(offset_size, BYTE_ALIGN_8);
           for (ele_idx = 0; ele_idx < pstr_api_struct->config[0].num_bs_elements; ele_idx++) {
             num_channel = pstr_api_struct->config[ele_idx].i_channels;
             if (pstr_api_struct->config[ele_idx].element_type != ID_LFE)
@@ -1314,24 +1314,24 @@ static VOID ixheaace_fill_mem_tabs(ixheaace_api_struct *pstr_api_struct, WORD32
                 (MAX_INPUT_SAMPLES + (INPUT_DELAY_ELDV2_512 * IXHEAACE_MAX_CH_IN_BS_ELE)) *
                 sizeof(pstr_api_struct->pstr_state->time_signal_mps[0]);
           }
-          pstr_mem_info->ui_size += IXHEAACE_GET_SIZE_ALIGNED(offset_size, BYTE_ALIGN_8);
+          pstr_mem_info->ui_size += IXHEAAC_GET_SIZE_ALIGNED(offset_size, BYTE_ALIGN_8);
           if (pstr_api_struct->config[0].mps_tree_config == TREE_212) {
             pstr_mem_info->ui_size +=
-                IXHEAACE_GET_SIZE_ALIGNED(sizeof(ixheaace_mps_212_memory_struct), BYTE_ALIGN_8);
+                IXHEAAC_GET_SIZE_ALIGNED(sizeof(ixheaace_mps_212_memory_struct), BYTE_ALIGN_8);
           } else {
             pstr_mem_info->ui_size +=
-                IXHEAACE_GET_SIZE_ALIGNED(sizeof(ixheaace_mps_515_memory_struct), BYTE_ALIGN_8);
+                IXHEAAC_GET_SIZE_ALIGNED(sizeof(ixheaace_mps_515_memory_struct), BYTE_ALIGN_8);
           }
-          pstr_mem_info->ui_size += IXHEAACE_GET_SIZE_ALIGNED(
+          pstr_mem_info->ui_size += IXHEAAC_GET_SIZE_ALIGNED(
               (MAX_MPS_BS_PAYLOAD_SIZE) * sizeof(pstr_api_struct->pstr_state->mps_bs[0]),
               BYTE_ALIGN_8);
         }
 
         offset_size = IXHEAACE_MAX_PAYLOAD_SIZE * pstr_api_struct->config[0].num_bs_elements;
-        pstr_mem_info->ui_size += IXHEAACE_GET_SIZE_ALIGNED(offset_size, BYTE_ALIGN_8);
+        pstr_mem_info->ui_size += IXHEAAC_GET_SIZE_ALIGNED(offset_size, BYTE_ALIGN_8);
         offset_size = (MAX_FRAME_LEN * 2 + MAX_DS_2_1_FILTER_DELAY + INPUT_DELAY) *
                       MAX_INPUT_CHAN * sizeof(pstr_mem_info->ui_size);
-        pstr_mem_info->ui_size += IXHEAACE_GET_SIZE_ALIGNED(offset_size, BYTE_ALIGN_8);
+        pstr_mem_info->ui_size += IXHEAAC_GET_SIZE_ALIGNED(offset_size, BYTE_ALIGN_8);
       }
 
       pstr_mem_info->ui_alignment = BYTE_ALIGN_8;
@@ -1455,7 +1455,7 @@ static IA_ERRORCODE ixheaace_alloc_and_assign_mem(ixheaace_api_struct *pstr_api_
     pstr_api_struct->pp_mem[i_idx] = pv_value;
 
     if (i_idx == IA_ENHAACPLUSENC_PERSIST_IDX) {
-      WORD32 offset_size = IXHEAACE_GET_SIZE_ALIGNED(sizeof(ixheaace_state_struct), BYTE_ALIGN_8);
+      WORD32 offset_size = IXHEAAC_GET_SIZE_ALIGNED(sizeof(ixheaace_state_struct), BYTE_ALIGN_8);
       WORD8 *p_offset = NULL;
 
       /* Set persistent memory pointer in api obj */
@@ -1472,7 +1472,7 @@ static IA_ERRORCODE ixheaace_alloc_and_assign_mem(ixheaace_api_struct *pstr_api_
 
         offset_size = pstr_usac_config->channels * sizeof(FLOAT32 *);
         p_offset = (WORD8 *)pstr_state->ptr_in_buf +
-                   IXHEAACE_GET_SIZE_ALIGNED(offset_size, BYTE_ALIGN_8);
+                   IXHEAAC_GET_SIZE_ALIGNED(offset_size, BYTE_ALIGN_8);
 
         // Input delay
         pstr_state->inp_delay = (FLOAT32 *)(p_offset);
@@ -1483,7 +1483,7 @@ static IA_ERRORCODE ixheaace_alloc_and_assign_mem(ixheaace_api_struct *pstr_api_
                 sizeof(pstr_state->inp_delay[0]), pstr_api_struct->config[0].use_mps) *
             pstr_api_struct->config[0].num_bs_elements;
         memset(pstr_state->inp_delay, 0, inp_delay_size);
-        p_offset += IXHEAACE_GET_SIZE_ALIGNED(inp_delay_size, BYTE_ALIGN_8);
+        p_offset += IXHEAAC_GET_SIZE_ALIGNED(inp_delay_size, BYTE_ALIGN_8);
         if (1 == pstr_usac_config->sbr_enable) {
           if (2 != pstr_usac_config->channels) {
             pstr_api_struct->pstr_state->time_signal = (FLOAT32 *)(p_offset);
@@ -1492,7 +1492,7 @@ static IA_ERRORCODE ixheaace_alloc_and_assign_mem(ixheaace_api_struct *pstr_api_
                    (MAX_INPUT_SAMPLES) * sizeof(pstr_api_struct->pstr_state->time_signal[0]));
             offset_size =
                 (MAX_INPUT_SAMPLES) * sizeof(pstr_api_struct->pstr_state->time_signal[0]);
-            p_offset += IXHEAACE_GET_SIZE_ALIGNED(offset_size, BYTE_ALIGN_8);
+            p_offset += IXHEAAC_GET_SIZE_ALIGNED(offset_size, BYTE_ALIGN_8);
           }
 
           pstr_api_struct->pstr_state->spectral_band_replication_enc_pers_mem[0] =
@@ -1507,7 +1507,7 @@ static IA_ERRORCODE ixheaace_alloc_and_assign_mem(ixheaace_api_struct *pstr_api_
                  (MAX_INPUT_SAMPLES) * sizeof(pstr_api_struct->pstr_state->time_signal_mps[0]));
           offset_size =
               (MAX_INPUT_SAMPLES) * sizeof(pstr_api_struct->pstr_state->time_signal_mps[0]);
-          p_offset += IXHEAACE_GET_SIZE_ALIGNED(offset_size, BYTE_ALIGN_8);
+          p_offset += IXHEAAC_GET_SIZE_ALIGNED(offset_size, BYTE_ALIGN_8);
           pstr_api_struct->pstr_state->mps_bs = (UWORD8 *)(p_offset);
 
           memset(pstr_api_struct->pstr_state->mps_bs, 0,
@@ -1515,23 +1515,23 @@ static IA_ERRORCODE ixheaace_alloc_and_assign_mem(ixheaace_api_struct *pstr_api_
 
           offset_size =
               (MAX_MPS_BS_PAYLOAD_SIZE) * sizeof(pstr_api_struct->pstr_state->mps_bs[0]);
-          p_offset += IXHEAACE_GET_SIZE_ALIGNED(offset_size, BYTE_ALIGN_8);
+          p_offset += IXHEAAC_GET_SIZE_ALIGNED(offset_size, BYTE_ALIGN_8);
 
           pstr_api_struct->pstr_state->mps_pers_mem = (ixheaace_mps_212_memory_struct *)p_offset;
           p_offset +=
-              IXHEAACE_GET_SIZE_ALIGNED(sizeof(ixheaace_mps_212_memory_struct), BYTE_ALIGN_8);
+              IXHEAAC_GET_SIZE_ALIGNED(sizeof(ixheaace_mps_212_memory_struct), BYTE_ALIGN_8);
         } else {
           pstr_api_struct->pstr_state->mps_bs = NULL;
         }
         if (1 == pstr_usac_config->use_drc_element) {
           pstr_state->pp_drc_in_buf = (FLOAT32 **)((WORD8 *)p_offset);
           offset_size = pstr_usac_config->channels * sizeof(pstr_state->pp_drc_in_buf[0]);
-          p_offset += IXHEAACE_GET_SIZE_ALIGNED(offset_size, BYTE_ALIGN_8);
+          p_offset += IXHEAAC_GET_SIZE_ALIGNED(offset_size, BYTE_ALIGN_8);
           p_temp = p_offset;
 
           for (i = 0; i < pstr_usac_config->channels; i++) {
             pstr_state->pp_drc_in_buf[i] = (FLOAT32 *)(p_offset);
-            p_offset += IXHEAACE_GET_SIZE_ALIGNED(
+            p_offset += IXHEAAC_GET_SIZE_ALIGNED(
                 (pstr_usac_config->drc_frame_size * sizeof(pstr_state->pp_drc_in_buf[0][0]) * 2),
                 BYTE_ALIGN_8);
           }
@@ -1541,7 +1541,7 @@ static IA_ERRORCODE ixheaace_alloc_and_assign_mem(ixheaace_api_struct *pstr_api_
 
         for (i = 0; i < pstr_usac_config->channels; i++) {
           pstr_state->ptr_in_buf[i] = (FLOAT32 *)(p_offset);
-          p_offset += IXHEAACE_GET_SIZE_ALIGNED((pstr_usac_config->ccfl * sizeof(FLOAT32) * 2),
+          p_offset += IXHEAAC_GET_SIZE_ALIGNED((pstr_usac_config->ccfl * sizeof(FLOAT32) * 2),
                                                 BYTE_ALIGN_8);
         }
         memset(p_temp, 0, (p_offset - p_temp));
@@ -1550,25 +1550,25 @@ static IA_ERRORCODE ixheaace_alloc_and_assign_mem(ixheaace_api_struct *pstr_api_
         offset_size = 0;
         for (i = 0; i < pstr_usac_config->channels; i++) {
           pstr_usac_enc_data->ptr_time_data[i] = (FLOAT64 *)(p_offset);
-          p_offset += IXHEAACE_GET_SIZE_ALIGNED((2 * (pstr_usac_config->ccfl) * sizeof(FLOAT64)),
+          p_offset += IXHEAAC_GET_SIZE_ALIGNED((2 * (pstr_usac_config->ccfl) * sizeof(FLOAT64)),
                                                 BYTE_ALIGN_8);
         }
 
         for (i = 0; i < pstr_usac_config->channels; i++) {
           pstr_usac_enc_data->ptr_look_ahead_time_data[i] = (FLOAT64 *)(p_offset);
           p_offset +=
-              IXHEAACE_GET_SIZE_ALIGNED((pstr_usac_config->ccfl * sizeof(FLOAT64)), BYTE_ALIGN_8);
+              IXHEAAC_GET_SIZE_ALIGNED((pstr_usac_config->ccfl * sizeof(FLOAT64)), BYTE_ALIGN_8);
         }
 
         for (i = 0; i < pstr_usac_config->channels; i++) {
           pstr_usac_enc_data->spectral_line_vector[i] = (FLOAT64 *)(p_offset);
-          p_offset += IXHEAACE_GET_SIZE_ALIGNED((2 * pstr_usac_config->ccfl * sizeof(FLOAT64)),
+          p_offset += IXHEAAC_GET_SIZE_ALIGNED((2 * pstr_usac_config->ccfl * sizeof(FLOAT64)),
                                                 BYTE_ALIGN_8);
         }
 
         for (i = 0; i < pstr_usac_config->channels; i++) {
           pstr_usac_enc_data->ptr_2frame_time_data[i] = (FLOAT64 *)(p_offset);
-          p_offset += IXHEAACE_GET_SIZE_ALIGNED((3 * pstr_usac_config->ccfl * sizeof(FLOAT64)),
+          p_offset += IXHEAAC_GET_SIZE_ALIGNED((3 * pstr_usac_config->ccfl * sizeof(FLOAT64)),
                                                 BYTE_ALIGN_8);
         }
         memset(p_temp, 0, p_offset - p_temp);
@@ -1577,7 +1577,7 @@ static IA_ERRORCODE ixheaace_alloc_and_assign_mem(ixheaace_api_struct *pstr_api_
           p_temp = p_offset;
           for (i = 0; i < pstr_usac_config->channels; i++) {
             pstr_usac_enc_data->pstr_tns_info[i] = (ia_tns_info *)(p_offset);
-            p_offset += IXHEAACE_GET_SIZE_ALIGNED(sizeof(ia_tns_info), BYTE_ALIGN_8);
+            p_offset += IXHEAAC_GET_SIZE_ALIGNED(sizeof(ia_tns_info), BYTE_ALIGN_8);
           }
           memset(p_temp, 0, p_offset - p_temp);
         }
@@ -1585,7 +1585,7 @@ static IA_ERRORCODE ixheaace_alloc_and_assign_mem(ixheaace_api_struct *pstr_api_
         p_temp = p_offset;
         for (i = 0; i < pstr_usac_config->channels; i++) {
           pstr_usac_enc_data->td_encoder[i] = (ia_usac_td_encoder_struct *)(p_offset);
-          p_offset += IXHEAACE_GET_SIZE_ALIGNED(sizeof(ia_usac_td_encoder_struct), BYTE_ALIGN_8);
+          p_offset += IXHEAAC_GET_SIZE_ALIGNED(sizeof(ia_usac_td_encoder_struct), BYTE_ALIGN_8);
         }
         memset(p_temp, 0, p_offset - p_temp);
       } else {
@@ -1601,7 +1601,7 @@ static IA_ERRORCODE ixheaace_alloc_and_assign_mem(ixheaace_api_struct *pstr_api_
                           pstr_api_struct->config[0].use_mps) *
                       pstr_api_struct->config[0].num_bs_elements;
         p_offset = (WORD8 *)pstr_api_struct->pstr_state->inp_delay +
-                   IXHEAACE_GET_SIZE_ALIGNED(offset_size, BYTE_ALIGN_8);
+                   IXHEAAC_GET_SIZE_ALIGNED(offset_size, BYTE_ALIGN_8);
 
         if (pstr_api_struct->config[0].use_mps) {
           pstr_api_struct->pstr_state->time_signal_mps = (FLOAT32 *)(p_offset);
@@ -1612,25 +1612,25 @@ static IA_ERRORCODE ixheaace_alloc_and_assign_mem(ixheaace_api_struct *pstr_api_
           offset_size =
               (MAX_INPUT_SAMPLES + (INPUT_DELAY_ELDV2_512 * IXHEAACE_MAX_CH_IN_BS_ELE)) *
               sizeof(pstr_api_struct->pstr_state->time_signal_mps[0]);
-          p_offset += IXHEAACE_GET_SIZE_ALIGNED(offset_size, BYTE_ALIGN_8);
+          p_offset += IXHEAAC_GET_SIZE_ALIGNED(offset_size, BYTE_ALIGN_8);
 
           pstr_api_struct->pstr_state->mps_bs = (UWORD8 *)(p_offset);
           memset(pstr_api_struct->pstr_state->mps_bs, 0,
                  (MAX_MPS_BS_PAYLOAD_SIZE) * sizeof(pstr_api_struct->pstr_state->mps_bs[0]));
           offset_size =
               (MAX_MPS_BS_PAYLOAD_SIZE) * sizeof(pstr_api_struct->pstr_state->mps_bs[0]);
-          p_offset += IXHEAACE_GET_SIZE_ALIGNED(offset_size, BYTE_ALIGN_8);
+          p_offset += IXHEAAC_GET_SIZE_ALIGNED(offset_size, BYTE_ALIGN_8);
 
           if (pstr_api_struct->config[0].mps_tree_config == TREE_212) {
             pstr_api_struct->pstr_state->mps_pers_mem =
                 (ixheaace_mps_212_memory_struct *)p_offset;
             p_offset +=
-                IXHEAACE_GET_SIZE_ALIGNED(sizeof(ixheaace_mps_212_memory_struct), BYTE_ALIGN_8);
+                IXHEAAC_GET_SIZE_ALIGNED(sizeof(ixheaace_mps_212_memory_struct), BYTE_ALIGN_8);
           } else {
             pstr_api_struct->pstr_state->mps_515_pers_mem =
                 (ixheaace_mps_515_memory_struct *)p_offset;
             p_offset +=
-                IXHEAACE_GET_SIZE_ALIGNED(sizeof(ixheaace_mps_515_memory_struct), BYTE_ALIGN_8);
+                IXHEAAC_GET_SIZE_ALIGNED(sizeof(ixheaace_mps_515_memory_struct), BYTE_ALIGN_8);
           }
         } else {
           pstr_api_struct->pstr_state->mps_bs = NULL;