diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-30 03:39:32 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-30 03:39:32 +0000 |
| commit | df295c1d1565db3531d5b5cd9656bfc2742eb7fc (patch) | |
| tree | bf072fc0d4df338da3614ed2604df6261f46212b | |
| parent | e46656b338a0b0d95b64fe971ac8f77929e02ec2 (diff) | |
| parent | b74b5dfe38ca90c4676566684e7d3b5b571ec33e (diff) | |
| download | libxaac-df295c1d1565db3531d5b5cd9656bfc2742eb7fc.tar.gz | |
Merge "Fix for NPD in ixheaacd_init_sbr" am: d5111468cd am: 2804d872a3 am: 3a78862c00 am: b74b5dfe38
Original change: https://android-review.googlesource.com/c/platform/external/libxaac/+/1426791
Change-Id: Ie8e65f6a2cd369d20e10f20fff88d5387455ae4c
| -rw-r--r-- | decoder/ixheaacd_api.c | 2 | ||||
| -rw-r--r-- | decoder/ixheaacd_headerdecode.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/decoder/ixheaacd_api.c b/decoder/ixheaacd_api.c index 2a03695..3a17d1d 100644 --- a/decoder/ixheaacd_api.c +++ b/decoder/ixheaacd_api.c @@ -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( diff --git a/decoder/ixheaacd_headerdecode.c b/decoder/ixheaacd_headerdecode.c index 573d67a..356cf08 100644 --- a/decoder/ixheaacd_headerdecode.c +++ b/decoder/ixheaacd_headerdecode.c @@ -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; } |