diff options
| author | Harish Mahendrakar <harish.mahendrakar@ittiam.com> | 2022-08-08 17:39:15 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-08-08 17:39:15 +0000 |
| commit | 61803678225bdfa64badf8410aa198562f006f6b (patch) | |
| tree | 3f691ec11b78372bd7c6983733b1afa587c49311 /decoder/ixheaacd_process.c | |
| parent | 9fcd70ea8901cef7e847e34f53638001820745d1 (diff) | |
| parent | 92ad84ae515583926ec94cb7bd4e4e716a3e73ac (diff) | |
| download | libxaac-61803678225bdfa64badf8410aa198562f006f6b.tar.gz | |
Update to v0.1.2 from upstream project am: 06b7d72a41 am: c13fd2dbf2 am: 8e00512043 am: 92ad84ae51
Original change: https://android-review.googlesource.com/c/platform/external/libxaac/+/2170068
Change-Id: Ibdf0f54f7a73a414e00c93b435af18a5f4bb403a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'decoder/ixheaacd_process.c')
| -rw-r--r-- | decoder/ixheaacd_process.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/decoder/ixheaacd_process.c b/decoder/ixheaacd_process.c index f1c7202..672f4c6 100644 --- a/decoder/ixheaacd_process.c +++ b/decoder/ixheaacd_process.c @@ -94,7 +94,9 @@ VOID ixheaacd_allocate_sbr_scr(ia_sbr_scr_struct *sbr_scratch_struct, VOID *base_scratch_ptr, VOID *output_ptr, WORD total_elements, WORD ch_fac, - WORD32 object_type); + WORD32 object_type, WORD32 total_channels, + WORD8 *p_qshift_arr, UWORD8 slot_element, + WORD32 channel); IA_ERRORCODE ixheaacd_applysbr( ia_handle_sbr_dec_inst_struct self, @@ -117,7 +119,7 @@ IA_ERRORCODE ixheaacd_esbr_process(ia_usac_data_struct *usac_data, ia_sbr_scr_struct sbr_scratch_struct; ixheaacd_allocate_sbr_scr(&sbr_scratch_struct, usac_data->sbr_scratch_mem_base, NULL, 2, 1, - audio_object_type); + audio_object_type, 0, NULL, 0, 0); self->usac_independency_flag = usac_data->usac_independency_flg; @@ -381,6 +383,13 @@ WORD32 ixheaacd_usac_process(ia_dec_data_struct *pstr_dec_data, pstr_usac_data->usac_independency_flg, it_bit_buff); if (err) return err; + p_state_aac_dec->mps_dec_handle.band_count[0] = + pstr_usac_data->pstr_esbr_dec->pstr_sbr_channel[0] + ->str_sbr_dec.band_count; + p_state_aac_dec->mps_dec_handle.band_count[1] = + pstr_usac_data->pstr_esbr_dec->pstr_sbr_channel[1] + ->str_sbr_dec.band_count; + for (ch = 0; ch < nr_core_coder_channels; ch++) { ptr_inp[2 * ch] = pstr_usac_data->pstr_esbr_dec->pstr_sbr_channel[ch] |