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

Merge "Fix for SEGV in ixheaacd_aacdec_decodeframe function." into rvc-dev

Browse source
This commit is contained in:
TreeHugger Robot 2020-03-09 22:30:23 +00:00 • committed by Android (Google) Code Review
commit 4bbb59d953
2 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
decoder/ixheaacd_api.c
View file

@ -2103,6 +2103,9 @@ IA_ERRORCODE ixheaacd_dec_init(
i++; i++;
} }
p_state_enhaacplus_dec->pers_mem_ptr =
(WORD8 *)p_state_enhaacplus_dec->aac_persistent_mem_v +
persistent_used_t;
p_obj_exhaacplus_dec->aac_config.i_channel_mask = p_obj_exhaacplus_dec->aac_config.i_channel_mask =
ixheaacd_get_channel_mask(p_obj_exhaacplus_dec); ixheaacd_get_channel_mask(p_obj_exhaacplus_dec);
@ -2542,14 +2545,12 @@ IA_ERRORCODE ixheaacd_dec_execute(
WORD32 pers_used = 0; WORD32 pers_used = 0;
skip_full_decode = 1; skip_full_decode = 1;
pers_used = ixheaacd_set_aac_persistent_buffers( pers_used = ixheaacd_set_aac_persistent_buffers(
(WORD8 *)p_state_enhaacplus_dec->aac_scratch_mem_v + (8 * 1024), p_state_enhaacplus_dec->pers_mem_ptr, channel);
channel);
{ {
struct ia_aac_persistent_struct *aac_persistent_mem = struct ia_aac_persistent_struct *aac_persistent_mem =
(struct ia_aac_persistent_struct (struct ia_aac_persistent_struct *)
*)((WORD8 *)p_state_enhaacplus_dec->aac_scratch_mem_v + p_state_enhaacplus_dec->pers_mem_ptr;
(8 * 1024));
aac_persistent_mem->str_aac_decoder.pstr_aac_tables = aac_persistent_mem->str_aac_decoder.pstr_aac_tables =
&p_obj_exhaacplus_dec->aac_tables; &p_obj_exhaacplus_dec->aac_tables;
aac_persistent_mem->str_aac_decoder.pstr_common_tables = aac_persistent_mem->str_aac_decoder.pstr_common_tables =
@ -2566,8 +2567,7 @@ IA_ERRORCODE ixheaacd_dec_execute(
p_state_enhaacplus_dec->pstr_stream_sbr[ch_idx], p_state_enhaacplus_dec->pstr_stream_sbr[ch_idx],
channel, channel, p_state_enhaacplus_dec->pers_mem_ptr,
(WORD8 *)p_state_enhaacplus_dec->aac_scratch_mem_v + (8 * 1024),
p_state_enhaacplus_dec->frame_length p_state_enhaacplus_dec->frame_length
); );

1
decoder/ixheaacd_struct_def.h
View file

@ -235,6 +235,7 @@ typedef struct ia_aac_dec_state_struct {
jmp_buf xaac_jmp_buf; jmp_buf xaac_jmp_buf;
WORD32 decode_create_done; WORD32 decode_create_done;
WORD32 fatal_err_present; WORD32 fatal_err_present;
WORD8 *pers_mem_ptr;
} ia_aac_dec_state_struct; } ia_aac_dec_state_struct;
typedef struct ia_exhaacplus_dec_api_struct { typedef struct ia_exhaacplus_dec_api_struct {