Merge "Fix for NPD in ixheaacd_init_sbr" am: d5111468cd am: 2804d872a3
Original change: 1426791
Change-Id: Iff1708130faa2d83dca8b2fea610a6f13e537a85
This commit is contained in:
commit
3a78862c00
2 changed files with 2 additions and 2 deletions
|
|
@ -1471,7 +1471,7 @@ IA_ERRORCODE ixheaacd_dec_init(
|
|||
p_state_enhaacplus_dec->i_bytes_consumed = 0;
|
||||
return IA_NO_ERROR;
|
||||
}
|
||||
|
||||
p_state_enhaacplus_dec->ui_init_done = 0;
|
||||
memset(&(p_state_enhaacplus_dec->eld_specific_config), 0,
|
||||
sizeof(ia_eld_specific_config_struct));
|
||||
return_val = ixheaacd_aac_headerdecode(
|
||||
|
|
|
|||
|
|
@ -546,7 +546,7 @@ WORD32 ixheaacd_ga_hdr_dec(ia_aac_dec_state_struct *aac_state_struct,
|
|||
ixheaacd_read_bits_buf(it_bit_buff, 5);
|
||||
}
|
||||
|
||||
if (aac_state_struct->header_dec_done) {
|
||||
if (aac_state_struct->header_dec_done || aac_state_struct->ui_init_done) {
|
||||
if (aac_state_struct->audio_object_type != aot_init) return IA_FATAL_ERROR;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue