diff options
Diffstat (limited to 'decoder/ixheaacd_imdct.c')
| -rw-r--r-- | decoder/ixheaacd_imdct.c | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/decoder/ixheaacd_imdct.c b/decoder/ixheaacd_imdct.c index c8d17de..bb32c7c 100644 --- a/decoder/ixheaacd_imdct.c +++ b/decoder/ixheaacd_imdct.c @@ -392,6 +392,9 @@ static IA_ERRORCODE ixheaacd_fd_imdct_short(ia_usac_data_struct *usac_data, ixheaacd_normalize(p_in_ibuffer, max_shift - 1, ixheaacd_drc_offset->n_long); shiftp += max_shift - 1; + if ((shiftp - shift_olap) > 31) { + shiftp = 31 + shift_olap; + } err_code = ixheaacd_calc_window(&window_short, ixheaacd_drc_offset->n_short, window_select, usac_data->ec_flag); if (err_code == -1) return err_code; @@ -518,6 +521,9 @@ static IA_ERRORCODE ixheaacd_fd_imdct_long(ia_usac_data_struct *usac_data, ixheaacd_calc_max_spectralline(p_in_ibuffer, ixheaacd_drc_offset->n_long); ixheaacd_normalize(p_in_ibuffer, max_shift - 1, ixheaacd_drc_offset->n_long); shiftp += max_shift - 1; + if ((shiftp - shift_olap) > 31) { + shiftp = 31 + shift_olap; + } switch (window_sequence) { case ONLY_LONG_SEQUENCE: @@ -553,10 +559,18 @@ static IA_ERRORCODE ixheaacd_fd_imdct_long(ia_usac_data_struct *usac_data, } for (i = 0; i < ixheaacd_drc_offset->n_long / 2; i++) { - p_overlap_ibuffer[ixheaacd_drc_offset->n_long / 2 + i] = + if (shiftp > shift_olap) { + p_overlap_ibuffer[ixheaacd_drc_offset->n_long / 2 + i] = ixheaac_negate32_sat(p_in_ibuffer[i]) >> (shiftp - shift_olap); - p_overlap_ibuffer[ixheaacd_drc_offset->n_long / 2 - i - 1] = + p_overlap_ibuffer[ixheaacd_drc_offset->n_long / 2 - i - 1] = ixheaac_negate32_sat(p_in_ibuffer[i]) >> (shiftp - shift_olap); + } + else { + p_overlap_ibuffer[ixheaacd_drc_offset->n_long / 2 + i] = + ixheaac_negate32_sat(p_in_ibuffer[i]) >> (shift_olap - shiftp); + p_overlap_ibuffer[ixheaacd_drc_offset->n_long / 2 - i - 1] = + ixheaac_negate32_sat(p_in_ibuffer[i]) >> (shift_olap - shiftp); + } } ixheaacd_scale_down_adj(p_out_ibuffer, p_out_ibuffer, |