From b173a0a69b14f74d6a1b3b3b484b3c870f8e46b4 Mon Sep 17 00:00:00 2001 From: Akshay Ragir Date: Mon, 22 Jan 2024 17:28:22 +0530 Subject: [PATCH] Aligned encoder with the latest changes in common directory [x] Tests done: Smoke test --- encoder/ixheaace_aac_constants.h | 2 - encoder/ixheaace_api.c | 102 +++++++++++++++---------------- encoder/ixheaace_enc_init.c | 30 ++++----- encoder/ixheaace_mps_enc.c | 3 +- encoder/ixheaace_resampler.c | 3 +- encoder/ixheaace_sbr_main.c | 62 +++++++++---------- 6 files changed, 99 insertions(+), 103 deletions(-) diff --git a/encoder/ixheaace_aac_constants.h b/encoder/ixheaace_aac_constants.h index 8c96a2f..eda300c 100644 --- a/encoder/ixheaace_aac_constants.h +++ b/encoder/ixheaace_aac_constants.h @@ -80,9 +80,7 @@ typedef struct { /* bits in byte (char) */ #define BYTE_NUMBIT 8 -#define BYTE_ALIGN_8 (8) #define EIGHT_BYTE_SIZE (8) -#define IXHEAACE_GET_SIZE_ALIGNED(size, alignment) ((size + (alignment - 1)) & ~(alignment - 1)) /* here we distinguish between stereo and the mono only encoder */ #define IXHEAACE_MAX_CH_IN_BS_ELE (2) 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; diff --git a/encoder/ixheaace_enc_init.c b/encoder/ixheaace_enc_init.c index 5abcb2a..dc6ba74 100644 --- a/encoder/ixheaace_enc_init.c +++ b/encoder/ixheaace_enc_init.c @@ -155,28 +155,28 @@ static VOID ixheaace_determine_bandwidth(const WORD32 proposed_bandwidth, const WORD32 ia_enhaacplus_enc_aac_enc_pers_size(WORD32 num_aac_chan, WORD32 aot) { WORD32 num_bytes; - num_bytes = IXHEAACE_GET_SIZE_ALIGNED(sizeof(iexheaac_encoder_str), BYTE_ALIGN_8); + num_bytes = IXHEAAC_GET_SIZE_ALIGNED(sizeof(iexheaac_encoder_str), BYTE_ALIGN_8); num_bytes += (num_aac_chan * - IXHEAACE_GET_SIZE_ALIGNED(sizeof(ixheaace_psy_out_channel), BYTE_ALIGN_8)); + IXHEAAC_GET_SIZE_ALIGNED(sizeof(ixheaace_psy_out_channel), BYTE_ALIGN_8)); num_bytes += (num_aac_chan * - IXHEAACE_GET_SIZE_ALIGNED(sizeof(ixheaace_psy_data), BYTE_ALIGN_8)); + IXHEAAC_GET_SIZE_ALIGNED(sizeof(ixheaace_psy_data), BYTE_ALIGN_8)); num_bytes += (num_aac_chan * - IXHEAACE_GET_SIZE_ALIGNED(sizeof(ixheaace_temporal_noise_shaping_data), BYTE_ALIGN_8)); + IXHEAAC_GET_SIZE_ALIGNED(sizeof(ixheaace_temporal_noise_shaping_data), BYTE_ALIGN_8)); if (aot == AOT_AAC_LC || aot == AOT_SBR || aot == AOT_PS) { num_bytes += (num_aac_chan * - IXHEAACE_GET_SIZE_ALIGNED(BLK_SWITCH_OFFSET_LC_128 * sizeof(FLOAT32), BYTE_ALIGN_8)); + IXHEAAC_GET_SIZE_ALIGNED(BLK_SWITCH_OFFSET_LC_128 * sizeof(FLOAT32), BYTE_ALIGN_8)); } else if (aot == AOT_AAC_LD || aot == AOT_AAC_ELD) { num_bytes += (num_aac_chan * - IXHEAACE_GET_SIZE_ALIGNED(BLK_SWITCH_OFFSET_LD * sizeof(FLOAT32), BYTE_ALIGN_8)); + IXHEAAC_GET_SIZE_ALIGNED(BLK_SWITCH_OFFSET_LD * sizeof(FLOAT32), BYTE_ALIGN_8)); } num_bytes += (num_aac_chan * - IXHEAACE_GET_SIZE_ALIGNED(sizeof(ixheaace_qc_out_channel), BYTE_ALIGN_8)); + IXHEAAC_GET_SIZE_ALIGNED(sizeof(ixheaace_qc_out_channel), BYTE_ALIGN_8)); return num_bytes; } WORD32 ia_enhaacplus_enc_aac_enc_scr_size(VOID) { - return IXHEAACE_GET_SIZE_ALIGNED(sizeof(iaace_scratch), BYTE_ALIGN_8); + return IXHEAAC_GET_SIZE_ALIGNED(sizeof(iaace_scratch), BYTE_ALIGN_8); } VOID ia_enhaacplus_enc_set_shared_bufs(iaace_scratch *scr, WORD32 **shared_buf1, @@ -225,7 +225,7 @@ VOID ia_enhaacplus_enc_init_aac_tabs(ixheaace_aac_tables *pstr_aac_tabs) { static VOID ia_enhaacplus_enc_aac_set_persist_buf(WORD8 *ptr_base, WORD32 num_chan, WORD32 aot) { iexheaac_encoder_str *pstr_exheaac_encoder; WORD8 *ptr_curr_mem = ptr_base + - IXHEAACE_GET_SIZE_ALIGNED(sizeof(iexheaac_encoder_str), BYTE_ALIGN_8); + IXHEAAC_GET_SIZE_ALIGNED(sizeof(iexheaac_encoder_str), BYTE_ALIGN_8); WORD32 i; pstr_exheaac_encoder = (iexheaac_encoder_str *)ptr_base; @@ -233,20 +233,20 @@ static VOID ia_enhaacplus_enc_aac_set_persist_buf(WORD8 *ptr_base, WORD32 num_ch for (i = 0; i < num_chan; i++) { pstr_exheaac_encoder->psy_out.psy_out_ch[i] = (ixheaace_psy_out_channel *)(ptr_curr_mem); ptr_curr_mem = ptr_curr_mem + - IXHEAACE_GET_SIZE_ALIGNED(sizeof(ixheaace_psy_out_channel), BYTE_ALIGN_8); + IXHEAAC_GET_SIZE_ALIGNED(sizeof(ixheaace_psy_out_channel), BYTE_ALIGN_8); } for (i = 0; i < num_chan; i++) { pstr_exheaac_encoder->psy_kernel.psy_data[i] = (ixheaace_psy_data *)(ptr_curr_mem); ptr_curr_mem = ptr_curr_mem + - IXHEAACE_GET_SIZE_ALIGNED(sizeof(ixheaace_psy_data), BYTE_ALIGN_8); + IXHEAAC_GET_SIZE_ALIGNED(sizeof(ixheaace_psy_data), BYTE_ALIGN_8); } for (i = 0; i < num_chan; i++) { pstr_exheaac_encoder->psy_kernel.temporal_noise_shaping_data[i] = (ixheaace_temporal_noise_shaping_data *)(ptr_curr_mem); ptr_curr_mem = ptr_curr_mem + - IXHEAACE_GET_SIZE_ALIGNED(sizeof(ixheaace_temporal_noise_shaping_data), BYTE_ALIGN_8); + IXHEAAC_GET_SIZE_ALIGNED(sizeof(ixheaace_temporal_noise_shaping_data), BYTE_ALIGN_8); } for (i = 0; i < num_chan; i++) { @@ -257,7 +257,7 @@ static VOID ia_enhaacplus_enc_aac_set_persist_buf(WORD8 *ptr_base, WORD32 num_ch pstr_exheaac_encoder->psy_kernel.psy_data[i]->ptr_mdct_delay_buf = (FLOAT32 *)(ptr_curr_mem); ptr_curr_mem = ptr_curr_mem + - IXHEAACE_GET_SIZE_ALIGNED(sizeof(FLOAT32) * BLK_SWITCH_OFFSET_LC_128, BYTE_ALIGN_8); + IXHEAAC_GET_SIZE_ALIGNED(sizeof(FLOAT32) * BLK_SWITCH_OFFSET_LC_128, BYTE_ALIGN_8); break; case AOT_AAC_LD: @@ -265,7 +265,7 @@ static VOID ia_enhaacplus_enc_aac_set_persist_buf(WORD8 *ptr_base, WORD32 num_ch pstr_exheaac_encoder->psy_kernel.psy_data[i]->ptr_mdct_delay_buf = (FLOAT32 *)(ptr_curr_mem); ptr_curr_mem = ptr_curr_mem + - IXHEAACE_GET_SIZE_ALIGNED(sizeof(FLOAT32) * BLK_SWITCH_OFFSET_LD, BYTE_ALIGN_8); + IXHEAAC_GET_SIZE_ALIGNED(sizeof(FLOAT32) * BLK_SWITCH_OFFSET_LD, BYTE_ALIGN_8); break; } } @@ -273,7 +273,7 @@ static VOID ia_enhaacplus_enc_aac_set_persist_buf(WORD8 *ptr_base, WORD32 num_ch for (i = 0; i < num_chan; i++) { pstr_exheaac_encoder->qc_out.qc_channel[i] = (ixheaace_qc_out_channel *)(ptr_curr_mem); ptr_curr_mem = ptr_curr_mem + - IXHEAACE_GET_SIZE_ALIGNED(sizeof(ixheaace_qc_out_channel), BYTE_ALIGN_8); + IXHEAAC_GET_SIZE_ALIGNED(sizeof(ixheaace_qc_out_channel), BYTE_ALIGN_8); } } diff --git a/encoder/ixheaace_mps_enc.c b/encoder/ixheaace_mps_enc.c index c111283..671825a 100644 --- a/encoder/ixheaace_mps_enc.c +++ b/encoder/ixheaace_mps_enc.c @@ -33,7 +33,6 @@ #include "ixheaace_mps_defines.h" #include "ixheaace_mps_common_define.h" #include "ixheaac_constants.h" -#include "ixheaace_aac_constants.h" #include "ixheaace_bitbuffer.h" #include "ixheaace_sbr_def.h" #include "ixheaace_mps_buf.h" @@ -1048,7 +1047,7 @@ WORD32 ixheaace_mps_515_scratch_size(VOID) { sizeof(FLOAT32)); size += (INPUT_LEN_DOWNSAMPLE * IXHEAACE_MAX_CH_IN_BS_ELE * UPSAMPLE_FAC * sizeof(FLOAT32)); size += (INPUT_LEN_DOWNSAMPLE * IXHEAACE_MAX_CH_IN_BS_ELE * UPSAMPLE_FAC * sizeof(FLOAT32)); - size = IXHEAACE_GET_SIZE_ALIGNED(size, BYTE_ALIGN_8); + size = IXHEAAC_GET_SIZE_ALIGNED(size, BYTE_ALIGN_8); return size; } diff --git a/encoder/ixheaace_resampler.c b/encoder/ixheaace_resampler.c index 8400b3d..4031da1 100644 --- a/encoder/ixheaace_resampler.c +++ b/encoder/ixheaace_resampler.c @@ -21,7 +21,6 @@ #include #include "ixheaac_type_def.h" #include "ixheaac_constants.h" -#include "ixheaace_aac_constants.h" #include "ixheaace_sbr_def.h" #include "ixheaace_resampler.h" #include "iusace_cnst.h" @@ -138,7 +137,7 @@ VOID ixheaace_get_input_scratch_buf(VOID *ptr_scr, FLOAT32 **ptr_scratch_buf_inp } WORD32 ixheaace_resampler_scr_size(VOID) { - return IXHEAACE_GET_SIZE_ALIGNED(sizeof(ixheaace_resampler_scratch), BYTE_ALIGN_8); + return IXHEAAC_GET_SIZE_ALIGNED(sizeof(ixheaace_resampler_scratch), BYTE_ALIGN_8); } static VOID ia_enhaacplus_enc_iir_sos_filter(ixheaace_iir_sos_resampler *pstr_down_sampler, diff --git a/encoder/ixheaace_sbr_main.c b/encoder/ixheaace_sbr_main.c index ba8fd00..8182365 100644 --- a/encoder/ixheaace_sbr_main.c +++ b/encoder/ixheaace_sbr_main.c @@ -726,7 +726,7 @@ ixheaace_env_encode_frame(ixheaace_pstr_sbr_enc pstr_env_encoder, FLOAT32 *ptr_s } WORD32 ixheaace_sbr_enc_scr_size(VOID) { - return IXHEAACE_GET_SIZE_ALIGNED(sizeof(ixheaace_str_sbr_enc_scratch), BYTE_ALIGN_8); + return IXHEAAC_GET_SIZE_ALIGNED(sizeof(ixheaace_str_sbr_enc_scratch), BYTE_ALIGN_8); } VOID ia_enhaacplus_enc_get_scratch_bufs(VOID *ptr_scr, FLOAT32 **ptr_shared_buf1, @@ -756,39 +756,39 @@ VOID ixheaace_sbr_set_scratch_ptr(ixheaace_pstr_sbr_enc pstr_env_enc, VOID *ptr_ WORD32 ixheaace_sbr_enc_pers_size(WORD32 num_ch, WORD32 use_ps, WORD32 harmonic_sbr) { WORD32 num_bytes; - num_bytes = IXHEAACE_GET_SIZE_ALIGNED(sizeof(struct ixheaace_str_sbr_enc), BYTE_ALIGN_8); - num_bytes += (IXHEAACE_GET_SIZE_ALIGNED(sizeof(struct ixheaace_str_enc_channel), BYTE_ALIGN_8) * + num_bytes = IXHEAAC_GET_SIZE_ALIGNED(sizeof(struct ixheaace_str_sbr_enc), BYTE_ALIGN_8); + num_bytes += (IXHEAAC_GET_SIZE_ALIGNED(sizeof(struct ixheaace_str_enc_channel), BYTE_ALIGN_8) * num_ch); - num_bytes += IXHEAACE_GET_SIZE_ALIGNED(sizeof(ixheaace_pvc_enc), BYTE_ALIGN_8); - num_bytes += (IXHEAACE_GET_SIZE_ALIGNED(2 * sizeof(FLOAT32) * QMF_FILTER_LENGTH, BYTE_ALIGN_8) * + num_bytes += IXHEAAC_GET_SIZE_ALIGNED(sizeof(ixheaace_pvc_enc), BYTE_ALIGN_8); + num_bytes += (IXHEAAC_GET_SIZE_ALIGNED(2 * sizeof(FLOAT32) * QMF_FILTER_LENGTH, BYTE_ALIGN_8) * num_ch); if (1 == harmonic_sbr) { - num_bytes += (IXHEAACE_GET_SIZE_ALIGNED(sizeof(ixheaace_str_hbe_enc), BYTE_ALIGN_8) * num_ch); - num_bytes += (IXHEAACE_GET_SIZE_ALIGNED(sizeof(ixheaace_str_esbr_hbe_txposer), BYTE_ALIGN_8) * + num_bytes += (IXHEAAC_GET_SIZE_ALIGNED(sizeof(ixheaace_str_hbe_enc), BYTE_ALIGN_8) * num_ch); + num_bytes += (IXHEAAC_GET_SIZE_ALIGNED(sizeof(ixheaace_str_esbr_hbe_txposer), BYTE_ALIGN_8) * num_ch); - num_bytes += (IXHEAACE_GET_SIZE_ALIGNED(IXHEAACE_MAX_HBE_PERSISTENT_SIZE, BYTE_ALIGN_8) * + num_bytes += (IXHEAAC_GET_SIZE_ALIGNED(IXHEAACE_MAX_HBE_PERSISTENT_SIZE, BYTE_ALIGN_8) * num_ch); - num_bytes += IXHEAACE_GET_SIZE_ALIGNED(ESBR_RESAMP_SAMPLES * sizeof(FLOAT32), BYTE_ALIGN_8); + num_bytes += IXHEAAC_GET_SIZE_ALIGNED(ESBR_RESAMP_SAMPLES * sizeof(FLOAT32), BYTE_ALIGN_8); } - num_bytes += (IXHEAACE_GET_SIZE_ALIGNED(sizeof(FLOAT32) * 5 * NO_OF_ESTIMATES * + num_bytes += (IXHEAAC_GET_SIZE_ALIGNED(sizeof(FLOAT32) * 5 * NO_OF_ESTIMATES * MAXIMUM_FREQ_COEFFS, BYTE_ALIGN_8) * num_ch); - num_bytes += (IXHEAACE_GET_SIZE_ALIGNED(sizeof(FLOAT32) * MAX_QMF_TIME_SLOTS * + num_bytes += (IXHEAAC_GET_SIZE_ALIGNED(sizeof(FLOAT32) * MAX_QMF_TIME_SLOTS * IXHEAACE_QMF_CHANNELS, BYTE_ALIGN_8) * num_ch); if (use_ps) { - num_bytes += IXHEAACE_GET_SIZE_ALIGNED(sizeof(struct ixheaace_str_enc_channel), BYTE_ALIGN_8); - num_bytes += IXHEAACE_GET_SIZE_ALIGNED(sizeof(struct ixheaace_ps_enc), BYTE_ALIGN_8); - num_bytes += IXHEAACE_GET_SIZE_ALIGNED(sizeof(FLOAT32) * QMF_FILTER_LENGTH, BYTE_ALIGN_8); + num_bytes += IXHEAAC_GET_SIZE_ALIGNED(sizeof(struct ixheaace_str_enc_channel), BYTE_ALIGN_8); + num_bytes += IXHEAAC_GET_SIZE_ALIGNED(sizeof(struct ixheaace_ps_enc), BYTE_ALIGN_8); + num_bytes += IXHEAAC_GET_SIZE_ALIGNED(sizeof(FLOAT32) * QMF_FILTER_LENGTH, BYTE_ALIGN_8); - num_bytes += IXHEAACE_GET_SIZE_ALIGNED(sizeof(WORD32) * 5 * NO_OF_ESTIMATES * + num_bytes += IXHEAAC_GET_SIZE_ALIGNED(sizeof(WORD32) * 5 * NO_OF_ESTIMATES * MAXIMUM_FREQ_COEFFS, BYTE_ALIGN_8); /*shared between spectral_band_replication_envYBuffer_fix and IIC IDD PS data buffers*/ - num_bytes += IXHEAACE_GET_SIZE_ALIGNED(sizeof(WORD32) * IXHEAACE_QMF_TIME_SLOTS * + num_bytes += IXHEAAC_GET_SIZE_ALIGNED(sizeof(WORD32) * IXHEAACE_QMF_TIME_SLOTS * IXHEAACE_QMF_CHANNELS, BYTE_ALIGN_8); } - num_bytes += IXHEAACE_GET_SIZE_ALIGNED(sizeof(ixheaace_str_sbr_qmf_filter_bank), BYTE_ALIGN_8); + num_bytes += IXHEAAC_GET_SIZE_ALIGNED(sizeof(ixheaace_str_sbr_qmf_filter_bank), BYTE_ALIGN_8); return num_bytes; } @@ -796,7 +796,7 @@ VOID ia_enhaacplus_enc_sbr_set_persist_buf(WORD8 *ptr_base, WORD32 num_ch, WORD3 WORD32 harmonic_sbr) { struct ixheaace_str_sbr_enc *pstr_env_enc; WORD8 *ptr_curr_mem = ptr_base + - IXHEAACE_GET_SIZE_ALIGNED(sizeof(struct ixheaace_str_sbr_enc), BYTE_ALIGN_8); + IXHEAAC_GET_SIZE_ALIGNED(sizeof(struct ixheaace_str_sbr_enc), BYTE_ALIGN_8); WORD32 i; pstr_env_enc = (struct ixheaace_str_sbr_enc *)ptr_base; @@ -804,63 +804,63 @@ VOID ia_enhaacplus_enc_sbr_set_persist_buf(WORD8 *ptr_base, WORD32 num_ch, WORD3 for (i = 0; i < num_ch; i++) { pstr_env_enc->pstr_env_channel[i] = (struct ixheaace_str_enc_channel *)(ptr_curr_mem); ptr_curr_mem = ptr_curr_mem + - IXHEAACE_GET_SIZE_ALIGNED(sizeof(struct ixheaace_str_enc_channel), BYTE_ALIGN_8); + IXHEAAC_GET_SIZE_ALIGNED(sizeof(struct ixheaace_str_enc_channel), BYTE_ALIGN_8); } for (i = 0; i < num_ch; i++) { pstr_env_enc->pstr_env_channel[i]->str_sbr_qmf.ptr_sbr_qmf_states_ana = (FLOAT32 *)ptr_curr_mem; - ptr_curr_mem += IXHEAACE_GET_SIZE_ALIGNED( + ptr_curr_mem += IXHEAAC_GET_SIZE_ALIGNED( sizeof(pstr_env_enc->pstr_env_channel[i]->str_sbr_qmf.ptr_sbr_qmf_states_ana[0]) * QMF_FILTER_LENGTH, BYTE_ALIGN_8); } if (!use_ps) { pstr_env_enc->ptr_common_buffer1 = (WORD32 *)ptr_curr_mem; - ptr_curr_mem += IXHEAACE_GET_SIZE_ALIGNED(sizeof(pstr_env_enc->ptr_common_buffer1[0]) * + ptr_curr_mem += IXHEAAC_GET_SIZE_ALIGNED(sizeof(pstr_env_enc->ptr_common_buffer1[0]) * num_ch * 5 * NO_OF_ESTIMATES * MAXIMUM_FREQ_COEFFS, BYTE_ALIGN_8); pstr_env_enc->ptr_common_buffer2 = (WORD32 *)ptr_curr_mem; - ptr_curr_mem += IXHEAACE_GET_SIZE_ALIGNED(sizeof(pstr_env_enc->ptr_common_buffer2[0]) * + ptr_curr_mem += IXHEAAC_GET_SIZE_ALIGNED(sizeof(pstr_env_enc->ptr_common_buffer2[0]) * num_ch * MAX_QMF_TIME_SLOTS * IXHEAACE_QMF_CHANNELS, BYTE_ALIGN_8); } else { pstr_env_enc->ptr_common_buffer1 = (WORD32 *)ptr_curr_mem; - ptr_curr_mem += IXHEAACE_GET_SIZE_ALIGNED(2 * sizeof(pstr_env_enc->ptr_common_buffer1[0]) * + ptr_curr_mem += IXHEAAC_GET_SIZE_ALIGNED(2 * sizeof(pstr_env_enc->ptr_common_buffer1[0]) * 5 * NO_OF_ESTIMATES * MAXIMUM_FREQ_COEFFS, BYTE_ALIGN_8); pstr_env_enc->ptr_common_buffer2 = (WORD32 *)ptr_curr_mem; - ptr_curr_mem += IXHEAACE_GET_SIZE_ALIGNED(2 * sizeof(pstr_env_enc->ptr_common_buffer2[0]) * + ptr_curr_mem += IXHEAAC_GET_SIZE_ALIGNED(2 * sizeof(pstr_env_enc->ptr_common_buffer2[0]) * IXHEAACE_QMF_TIME_SLOTS * IXHEAACE_QMF_CHANNELS, BYTE_ALIGN_8); } // PVC encoder pstr_env_enc->pstr_pvc_enc = (ixheaace_pvc_enc *)ptr_curr_mem; - ptr_curr_mem = ptr_curr_mem + IXHEAACE_GET_SIZE_ALIGNED(sizeof(ixheaace_pvc_enc), BYTE_ALIGN_8); + ptr_curr_mem = ptr_curr_mem + IXHEAAC_GET_SIZE_ALIGNED(sizeof(ixheaace_pvc_enc), BYTE_ALIGN_8); // Harmonic SBR if (1 == harmonic_sbr) { for (i = 0; i < num_ch; i++) { pstr_env_enc->pstr_env_channel[i]->pstr_hbe_enc = (ixheaace_str_hbe_enc *)ptr_curr_mem; ptr_curr_mem = ptr_curr_mem + - IXHEAACE_GET_SIZE_ALIGNED(sizeof(ixheaace_str_hbe_enc), BYTE_ALIGN_8); + IXHEAAC_GET_SIZE_ALIGNED(sizeof(ixheaace_str_hbe_enc), BYTE_ALIGN_8); pstr_env_enc->pstr_env_channel[i]->pstr_hbe_enc->pstr_hbe_txposer = (ixheaace_str_esbr_hbe_txposer *)ptr_curr_mem; ptr_curr_mem = ptr_curr_mem + - IXHEAACE_GET_SIZE_ALIGNED(sizeof(ixheaace_str_esbr_hbe_txposer), BYTE_ALIGN_8); + IXHEAAC_GET_SIZE_ALIGNED(sizeof(ixheaace_str_esbr_hbe_txposer), BYTE_ALIGN_8); pstr_env_enc->pstr_env_channel[i]->pstr_hbe_enc->ptr_hbe_txposer_buffers = (VOID *)ptr_curr_mem; ptr_curr_mem = ptr_curr_mem + IXHEAACE_MAX_HBE_PERSISTENT_SIZE; } pstr_env_enc->ptr_hbe_resample_buf = (FLOAT32 *)ptr_curr_mem; - ptr_curr_mem = ptr_curr_mem + IXHEAACE_GET_SIZE_ALIGNED( + ptr_curr_mem = ptr_curr_mem + IXHEAAC_GET_SIZE_ALIGNED( (ESBR_RESAMP_SAMPLES * sizeof(pstr_env_enc->ptr_hbe_resample_buf[0])), BYTE_ALIGN_8); } if (use_ps) { pstr_env_enc->pstr_env_channel[1] = (struct ixheaace_str_enc_channel *)(ptr_curr_mem); ptr_curr_mem = ptr_curr_mem + - IXHEAACE_GET_SIZE_ALIGNED(sizeof(struct ixheaace_str_enc_channel), BYTE_ALIGN_8); + IXHEAAC_GET_SIZE_ALIGNED(sizeof(struct ixheaace_str_enc_channel), BYTE_ALIGN_8); memset(pstr_env_enc->pstr_env_channel[1], 0, sizeof(struct ixheaace_str_enc_channel)); pstr_env_enc->pstr_env_channel[1]->str_sbr_qmf.ptr_sbr_qmf_states_ana = (FLOAT32 *)ptr_curr_mem; - ptr_curr_mem += IXHEAACE_GET_SIZE_ALIGNED( + ptr_curr_mem += IXHEAAC_GET_SIZE_ALIGNED( sizeof(pstr_env_enc->pstr_env_channel[1]->str_sbr_qmf.ptr_sbr_qmf_states_ana[0]) * QMF_FILTER_LENGTH, BYTE_ALIGN_8); memset(pstr_env_enc->pstr_env_channel[1]->str_sbr_qmf.ptr_sbr_qmf_states_ana, 0, @@ -869,7 +869,7 @@ VOID ia_enhaacplus_enc_sbr_set_persist_buf(WORD8 *ptr_base, WORD32 num_ch, WORD3 pstr_env_enc->pstr_ps_enc = (struct ixheaace_ps_enc *)(ptr_curr_mem); ptr_curr_mem = ptr_curr_mem + - IXHEAACE_GET_SIZE_ALIGNED(sizeof(struct ixheaace_ps_enc), BYTE_ALIGN_8); + IXHEAAC_GET_SIZE_ALIGNED(sizeof(struct ixheaace_ps_enc), BYTE_ALIGN_8); memset(pstr_env_enc->pstr_ps_enc, 0, sizeof(struct ixheaace_ps_enc)); } pstr_env_enc->pstr_synthesis_qmf_bank = (ixheaace_str_sbr_qmf_filter_bank *)(ptr_curr_mem);