diff options
| author | Rajat Kumar <rajat.kumar@ittiam.com> | 2019-04-04 18:38:08 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-04-04 18:38:08 -0700 |
| commit | 7d2d1b18002db96e805fda336bfee75636514e39 (patch) | |
| tree | 094b6225193af8f907713bf055accada595882b3 | |
| parent | 8d49de552e3051e252272178a2b914bfd4f615b1 (diff) | |
| parent | e1aee2fa4a1c94a1902ba511b83d5dbf499aaaf6 (diff) | |
| download | libxaac-7d2d1b18002db96e805fda336bfee75636514e39.tar.gz | |
Merge "Fix for array out of bound access in aac decoding" into qt-dev
am: e1aee2fa4a
Change-Id: I1d1cc6cab57c38e22226efaed423ee287bac862c
| -rw-r--r-- | decoder/ixheaacd_aacdecoder.c | 10 | ||||
| -rw-r--r-- | decoder/ixheaacd_drc_data_struct.h | 1 |
2 files changed, 0 insertions, 11 deletions
diff --git a/decoder/ixheaacd_aacdecoder.c b/decoder/ixheaacd_aacdecoder.c index bd25a91..19770ad 100644 --- a/decoder/ixheaacd_aacdecoder.c +++ b/decoder/ixheaacd_aacdecoder.c @@ -760,16 +760,6 @@ WORD32 ixheaacd_aacdec_decodeframe( } } - if (p_obj_exhaacplus_dec->aac_config.ui_drc_enable) { - for (ch = 0; ch < num_ch; ch++) { - pstr_drc_dec->is_longblock[*ch_idx + ch] = - (aac_dec_handle->pstr_aac_dec_ch_info[ch] - ->str_ics_info.window_sequence == EIGHT_SHORT_SEQUENCE) - ? 0 - : 1; - } - } - if (object_type == AOT_ER_AAC_LD) { for (ch = 0; ch < channel; ch++) { aac_dec_handle->ptr_aac_dec_static_channel_info[ch]->ltp_lag = diff --git a/decoder/ixheaacd_drc_data_struct.h b/decoder/ixheaacd_drc_data_struct.h index 9e1980b..faf9775 100644 --- a/decoder/ixheaacd_drc_data_struct.h +++ b/decoder/ixheaacd_drc_data_struct.h @@ -76,7 +76,6 @@ typedef struct { UWORD8 max_audio_channels; UWORD8 length_history; UWORD8 num_drc_elements; - WORD32 is_longblock[MAX_BS_ELEMENT]; WORD32 state; WORD32 target_ref_level; WORD32 prog_ref_level; |