diff --git a/decoder/ixheaacd_bitbuffer.c b/decoder/ixheaacd_bitbuffer.c index 3c25161..9cd404a 100644 --- a/decoder/ixheaacd_bitbuffer.c +++ b/decoder/ixheaacd_bitbuffer.c @@ -118,29 +118,6 @@ UWORD32 ixheaacd_aac_read_byte(UWORD8 **ptr_read_next, WORD32 *bit_pos, return 1; } -UWORD32 ixheaacd_aac_read_2bytes(UWORD8 **ptr_read_next, WORD32 *bit_pos, - WORD32 *readword) { - UWORD8 *v = *ptr_read_next; - WORD32 bits_consumed = *bit_pos; - - if ((bits_consumed - 16) >= 0) { - *readword = (*readword << 8) | *v; - v++; - *readword = (*readword << 8) | *v; - v++; - bits_consumed -= 16; - - } else if ((bits_consumed - 8) >= 0) { - *readword = (*readword << 8) | *v; - v++; - bits_consumed -= 8; - } - - *bit_pos = bits_consumed; - *ptr_read_next = v; - return 1; -} - UWORD32 ixheaacd_aac_read_byte_corr1(UWORD8 **ptr_read_next, WORD32 *ptr_bit_pos, WORD32 *readword, UWORD8 *p_bit_buf_end) { diff --git a/decoder/ixheaacd_bitbuffer.h b/decoder/ixheaacd_bitbuffer.h index 2db8db6..7ddb462 100644 --- a/decoder/ixheaacd_bitbuffer.h +++ b/decoder/ixheaacd_bitbuffer.h @@ -113,9 +113,6 @@ UWORD32 ixheaacd_aac_showbits_32(UWORD8 *ptr_read_next); UWORD32 ixheaacd_aac_read_byte(UWORD8 **ptr_read_next, WORD32 *bit_pos, WORD32 *readword); -UWORD32 ixheaacd_aac_read_2bytes(UWORD8 **ptr_read_next, WORD32 *bit_pos, - WORD32 *readword); - UWORD32 ixheaacd_aac_read_byte_corr(UWORD8 **ptr_read_next, WORD32 *ptr_bit_pos, WORD32 *readword, UWORD8 *p_bit_buf_end); diff --git a/decoder/ixheaacd_longblock.c b/decoder/ixheaacd_longblock.c index 18a62ec..8439645 100644 --- a/decoder/ixheaacd_longblock.c +++ b/decoder/ixheaacd_longblock.c @@ -246,7 +246,8 @@ VOID ixheaacd_read_scale_factor_data( noise_start_value = temp; bit_pos += 9; - ixheaacd_aac_read_2bytes(&ptr_read_next, &bit_pos, &read_word); + ixheaacd_aac_read_byte_corr1(&ptr_read_next, &bit_pos, &read_word, + it_bit_buff->ptr_bit_buf_end); norm_value = noise_start_value - 256; ptr_pns_info->pns_active = 1; diff --git a/decoder/ixheaacd_spectrum_dec.c b/decoder/ixheaacd_spectrum_dec.c index dff3713..c0b663c 100644 --- a/decoder/ixheaacd_spectrum_dec.c +++ b/decoder/ixheaacd_spectrum_dec.c @@ -278,7 +278,8 @@ VOID ixheaacd_section_data(ia_usac_data_struct *usac_data, ixheaacd_huffman_decode(read_word1, &index, &length, hscf, idx_tab); bit_pos += length; - ixheaacd_aac_read_2bytes(&ptr_read_next, &bit_pos, &read_word); + ixheaacd_aac_read_byte_corr1(&ptr_read_next, &bit_pos, &read_word, + g_bs->ptr_bit_buf_end); norm_val = index - 60; if (cb_num > NOISE_HCB) {