diff options
| author | Ray Essick <essick@google.com> | 2018-05-25 11:19:24 -0700 |
|---|---|---|
| committer | Ray Essick <essick@google.com> | 2018-05-25 11:35:52 -0700 |
| commit | 4908247643e9e97852e847c00bfe7c4259279538 (patch) | |
| tree | 85f957eaa8ca88112bfb1a7ad6a804d9f0977278 /decoder/ixheaacd_aacdecoder.c | |
| parent | 51aa06e124ba688ca810b25ee0b5bb66678aac14 (diff) | |
| download | libxaac-4908247643e9e97852e847c00bfe7c4259279538.tar.gz | |
Sanitization fixes from new CTS tests
Updates from vendor to remedy issues exposed by new CTS tests
Bug: 77287124
Test: CTS DecoderTest, DecoderTest{AacDrc,XheAac}
@ Sanitizer fixes in libxaac
Fixes few integer overflow sanitizer errors
Progagate few errors
ENABLE_DRC macro is removed
AMMENDMENT1 macro is removed
Change-Id: Ic61163dfd6318bd4a00ed45e1295c819cb0f637b
@ Add support for audio pre-roll and DRC effect type
Also includes the following
MPEG-D DRC parameters related changes
USAC config switch changes
SBR config switch changes
Bug: 80133175
Change-Id: I0ab25641768cf523b66f7b0fcb4137429c1c4a77
@ Fixed trailing spaces
Change-Id: I32de0c9d3f7237e1fbf8dfef1cac485ef8458173
@ Replaced tabs
Change-Id: Ic741ee13d7b978b37edc27d087903caaa40b8d90
Diffstat (limited to 'decoder/ixheaacd_aacdecoder.c')
| -rw-r--r-- | decoder/ixheaacd_aacdecoder.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/decoder/ixheaacd_aacdecoder.c b/decoder/ixheaacd_aacdecoder.c index faffd27..69d060c 100644 --- a/decoder/ixheaacd_aacdecoder.c +++ b/decoder/ixheaacd_aacdecoder.c @@ -647,10 +647,10 @@ WORD32 ixheaacd_aacdec_decodeframe( it_bit_buff, ptr_ics_info, object_type, aac_dec_handle->samples_per_frame, LEFT); - if(temp!=0) - { - return temp; - } + if(temp!=0) + { + return temp; + } } } } @@ -706,7 +706,8 @@ WORD32 ixheaacd_aacdec_decodeframe( ixheaacd_extension_payload(it_bit_buff, cnt_bits); } - if ((object_type == AOT_ER_AAC_ELD) || (object_type == AOT_ER_AAC_LD)) { + if (((object_type == AOT_ER_AAC_ELD) || (object_type == AOT_ER_AAC_LD)) + && (p_obj_exhaacplus_dec->aac_config.ld_decoder != 1)) { if (it_bit_buff->cnt_bits) { WORD32 alignment = it_bit_buff->bit_pos & 0x07; it_bit_buff->cnt_bits = (it_bit_buff->cnt_bits + alignment) & 7; |