wrapper/libxaac
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Fix for global buffer overflow in scale factor processing" into pi-dev

Browse source 
am: d68bf5d05d

Change-Id: I82a93caf2aa49315e4312446fc08561caf8de685
This commit is contained in:
Ramesh Katuri 2018-09-06 16:29:05 -07:00 • committed by android-build-merger
commit 16bc207b39
2 changed files with 2 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
decoder/ixheaacd_env_extr.c
View file

@ -1328,8 +1328,7 @@ int ixheaacd_extract_frame_info_ld(
WORD16 time_border[MAX_ENVELOPES + 1];
WORD16 time_border_noise[2 + 1];
WORD16 f[MAX_ENVELOPES + 1];
int rel_bord_lead[3];
int rel_bord_trail[3] = {0};
int rel_bord_lead[7] ={0};
ia_frame_info_struct *v_frame_info = &h_frame_data->str_frame_info_details;
@ -1382,11 +1381,6 @@ int ixheaacd_extract_frame_info_ld(
time_border[env] = abs_bord_lead;
for (k = 0; k <= env - 1; k++) time_border[env] += rel_bord_lead[k];
}
for (env = num_rel_lead + 1; env < bs_num_env; env++) {
time_border[env] = abs_bord_trail;
for (k = 0; k <= bs_num_env - env - 1; k++)
time_border[env] -= rel_bord_trail[k];
}
break;
case LD_TRAN:

2
decoder/ixheaacd_sbr_const.h
View file

@ -223,7 +223,7 @@ static const int ixheaacd_ld_env_table_480[15][4] = {
{2, 12, -1, 1}, {2, 13, -1, 1}, {2, 14, -1, 1},
};
static const int ixheaacd_ld_env_table_time_slot[4] = {8, 5, 0, 0};
static const int ixheaacd_ld_env_table_time_slot[7] = {8, 5, 0, 0, 0, 0, 0};
#define SBR_CLA_BITS 2
#define SBR_ABS_BITS 2