diff options
Diffstat (limited to 'decoder/ixheaacd_longblock.c')
| -rw-r--r-- | decoder/ixheaacd_longblock.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/decoder/ixheaacd_longblock.c b/decoder/ixheaacd_longblock.c index 574941e..0938389 100644 --- a/decoder/ixheaacd_longblock.c +++ b/decoder/ixheaacd_longblock.c @@ -39,9 +39,10 @@ #include "ixheaacd_drc_data_struct.h" #include "ixheaacd_lt_predict.h" - -#include "ixheaacd_channelinfo.h" #include "ixheaacd_cnst.h" +#include "ixheaacd_ec_defines.h" +#include "ixheaacd_ec_struct_def.h" +#include "ixheaacd_channelinfo.h" #include "ixheaacd_drc_dec.h" #include "ixheaacd_block.h" @@ -124,7 +125,7 @@ IA_ERRORCODE ixheaacd_read_section_data( band_offsets[top] - band_offsets[sfb]; num_lines_sec_idx++; if (sect_cb == (ESC_HCB + 1)) { - return IA_ENHAACPLUS_DEC_EXE_NONFATAL_INVALID_CODE_BOOK; + return IA_XHEAAC_DEC_EXE_NONFATAL_INVALID_CODE_BOOK; } else { *ptr_hcr_code_book++ = sect_cb; } @@ -134,11 +135,11 @@ IA_ERRORCODE ixheaacd_read_section_data( sfb = (sfb + sect_len); if (sfb > max_sfb) { return (WORD16)( - (WORD32)IA_ENHAACPLUS_DEC_EXE_NONFATAL_EXCEEDS_SFB_TRANSMITTED); + (WORD32)IA_XHEAAC_DEC_EXE_NONFATAL_EXCEEDS_SFB_TRANSMITTED); } if (sect_cb == (ESC_HCB + 1)) { return (WORD16)( - (WORD32)IA_ENHAACPLUS_DEC_EXE_NONFATAL_INVALID_CODE_BOOK); + (WORD32)IA_XHEAAC_DEC_EXE_NONFATAL_INVALID_CODE_BOOK); } while (sect_len--) { @@ -297,8 +298,9 @@ VOID ixheaacd_read_scale_factor_data( it_bit_buff->bit_pos = 7 - bit_pos; { WORD bits_consumed; - bits_consumed = ((it_bit_buff->ptr_read_next - start_read_pos) << 3) + - (start_bit_pos - it_bit_buff->bit_pos); + bits_consumed = + (WORD)(((it_bit_buff->ptr_read_next - start_read_pos) << 3) + + (start_bit_pos - it_bit_buff->bit_pos)); it_bit_buff->cnt_bits -= bits_consumed; } } |