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

1 files changed, 201 insertions, 10 deletions

diff --git a/decoder/ixheaacd_decode_main.c b/decoder/ixheaacd_decode_main.c
index 7ae8676..efd867c 100644
--- a/decoder/ixheaacd_decode_main.c
+++ b/decoder/ixheaacd_decode_main.c
@@ -124,6 +124,99 @@ VOID ixheaacd_samples_sat(WORD8 *outbuffer, WORD32 num_samples_out,
   }
 }
 
+/* audio pre roll frame parsing*/
+static WORD32 ixheaacd_audio_preroll_parsing(ia_dec_data_struct *pstr_dec_data, UWORD8 *conf_buf,WORD32 *preroll_units, WORD32 *preroll_frame_offset)
+{
+    ia_bit_buf_struct *temp_buff = (ia_bit_buf_struct *)&(pstr_dec_data->dec_bit_buf);
+    WORD32 independency_flag = 0;
+    WORD32 ext_ele_present = 0;
+    WORD32 ext_ele_use_dflt_len = 0;
+    WORD32 ext_ele_payload_len = 0;
+
+    WORD32 apply_crossfade = 0;
+    WORD32 un_used_val = 0;
+    WORD32 num_pre_roll_frames = 0;
+
+    WORD32 frame_idx = 0;
+    WORD32 frame_len[18] = { 0 }; // max of escapedValue(2, 4, 0) i.e. 2^2 -1 + 2^4 -1;
+    WORD32 temp = 0;
+
+    WORD32 config_len = 0;
+    WORD32 loop;
+
+    if (pstr_dec_data->str_frame_data.str_audio_specific_config.str_usac_config.str_usac_dec_config.usac_element_type[0] == ID_USAC_EXT)
+    {
+        temp = ixheaacd_show_bits_buf(temp_buff, 3);
+        independency_flag = (temp >> 2) & 0x1;
+        ext_ele_present = (temp >> 1) & 0x1;
+
+        if (ext_ele_present)
+        {
+            ext_ele_use_dflt_len = temp & 0x1; // ixheaacd_read_bit(&temp_buff, 1);
+            if (ext_ele_use_dflt_len != 0)
+                return 0;
+
+            un_used_val = ixheaacd_read_bits_buf(temp_buff, 3);
+
+            ext_ele_payload_len = ixheaacd_read_bits_buf(temp_buff, 8);
+
+            if (ext_ele_payload_len == 255) {
+                WORD32 val_add = 0;
+                val_add = ixheaacd_read_bits_buf(temp_buff, 16);
+                ext_ele_payload_len = (UWORD32)((WORD32)ext_ele_payload_len + val_add - 2);
+            }
+
+            //escapedValue(4, 4, 8);
+            config_len = ixheaacd_read_bits_buf(temp_buff, 4);
+            if (config_len == 15)
+            {
+                WORD32 val_add = 0;
+                val_add = ixheaacd_read_bits_buf(temp_buff, 4);
+                config_len += val_add;
+                if (val_add == 15)
+                {
+                    WORD32 val_add1 = 0;
+                    val_add1 = ixheaacd_read_bits_buf(temp_buff, 8);
+                    config_len += val_add1;
+                }
+            }
+
+            for(loop=0; loop < config_len; loop++)
+                conf_buf[loop] = ixheaacd_read_bits_buf(temp_buff, 8);
+
+
+            apply_crossfade = ixheaacd_read_bits_buf(temp_buff, 1);
+            un_used_val = ixheaacd_read_bits_buf(temp_buff, 1);   // reserverd
+
+            //escapedValue(2, 4, 0);
+            num_pre_roll_frames = ixheaacd_read_bits_buf(temp_buff, 2);
+            if (num_pre_roll_frames == 3)
+            {
+                WORD32 val_add = 0;
+                val_add = ixheaacd_read_bits_buf(temp_buff, 4);
+                num_pre_roll_frames += val_add;
+            }
+
+            for (frame_idx = 0; frame_idx < num_pre_roll_frames; frame_idx++)
+            {
+                WORD32 au_len = 0;  //escapedValued(16,16,0)
+                au_len = ixheaacd_read_bits_buf(temp_buff, 16);
+                if (au_len == 65535)
+                {
+                    WORD32 val_add = ixheaacd_read_bits_buf(temp_buff, 16);
+                    au_len += val_add;
+                }
+                preroll_frame_offset[frame_idx]=temp_buff->size-temp_buff->cnt_bits;
+                frame_len[frame_idx] = (8 * au_len) + (temp_buff->size - temp_buff->cnt_bits);
+                temp_buff->ptr_read_next += au_len;
+                temp_buff->cnt_bits -= au_len * 8;
+            }
+        }
+    }
+    *preroll_units=num_pre_roll_frames;
+    return config_len;
+}
+
 WORD32 ixheaacd_dec_main(VOID *temp_handle, WORD8 *inbuffer, WORD8 *outbuffer,
                          WORD32 *out_bytes, WORD32 frames_done, WORD32 pcmsize,
                          WORD32 *num_channel_out) {
@@ -139,6 +232,13 @@ WORD32 ixheaacd_dec_main(VOID *temp_handle, WORD8 *inbuffer, WORD8 *outbuffer,
   WORD32 suitable_tracks = 1;
   WORD32 num_samples_out;
   ia_dec_data_struct *pstr_dec_data;
+  UWORD8 config[285];  //max of escapedValue(4, 4, 8) i.e. 2^4 -1 + 2^4 -1 + 2^8 -1;
+  WORD32 config_len;
+  WORD32 delay;
+  WORD preroll_frame_offset[4]={0};
+  WORD preroll_units=-1;
+  WORD32 access_units=0;
+
 
   if (frames_done == 0) {
     if ((pstr_audio_specific_config->channel_configuration > 2) ||
@@ -167,9 +267,9 @@ WORD32 ixheaacd_dec_main(VOID *temp_handle, WORD8 *inbuffer, WORD8 *outbuffer,
       WORD32 delay;
       delay = ixheaacd_decode_create(
           handle, pstr_dec_data,
-          pstr_dec_data->pstr_frame_data->scal_out_select + 1);
+          pstr_dec_data->str_frame_data.scal_out_select + 1);
       if (delay == -1) return -1;
-      *num_channel_out = pstr_dec_data->pstr_frame_data->scal_out_num_channels;
+      *num_channel_out = pstr_dec_data->str_frame_data.scal_out_num_channels;
       return 0;
     }
 
@@ -181,30 +281,121 @@ WORD32 ixheaacd_dec_main(VOID *temp_handle, WORD8 *inbuffer, WORD8 *outbuffer,
     pstr_dec_data->dec_bit_buf.bit_pos = 7;
     pstr_dec_data->dec_bit_buf.cnt_bits = pstr_dec_data->dec_bit_buf.size;
 
-    pstr_dec_data->pstr_usac_data->usac_flag = aac_dec_handle->usac_flag;
+    pstr_dec_data->str_usac_data.usac_flag = aac_dec_handle->usac_flag;
+
+    /* audio pre roll frame parsing*/
+
+    do{
+
+    config_len=0;
+    if(access_units==0&&pstr_audio_specific_config->str_usac_config.str_usac_dec_config.preroll_flag)
+    {
+        config_len = ixheaacd_audio_preroll_parsing(pstr_dec_data,&config[0],&preroll_units,&preroll_frame_offset[0]);
+    }
+
+    if (config_len != 0)
+    {
+
+
+        /* updating the config parameters*/
+        ia_bit_buf_struct *config_bit_buf = (ia_bit_buf_struct *)malloc(sizeof(ia_bit_buf_struct));
+
+        config_bit_buf->ptr_bit_buf_base = config;
+        config_bit_buf->size = config_len << 3;
+        config_bit_buf->ptr_read_next = config_bit_buf->ptr_bit_buf_base;
+        config_bit_buf->ptr_bit_buf_end =(UWORD8 *)config + config_len;
+        config_bit_buf->bit_pos = 7;
+        config_bit_buf->cnt_bits = config_bit_buf->size;
+
+
+
+
+
+
+        suitable_tracks =
+            ixheaacd_frm_data_init(pstr_audio_specific_config, pstr_dec_data);
+
+        if (suitable_tracks <= 0)
+            return -1;
+
+        /* call codec re-configure*/
+        err = ixheaacd_config(config_bit_buf, &(pstr_dec_data->str_frame_data.str_audio_specific_config.str_usac_config)/*&pstr_audio_specific_config->str_usac_config*/);
+        free(config_bit_buf);
+        if (err != 0) return -1;
+
+
+        delay = ixheaacd_decode_create(
+            handle, pstr_dec_data,
+            pstr_dec_data->str_frame_data.scal_out_select + 1);
+        if (delay == -1) return -1;
+        *num_channel_out = pstr_dec_data->str_frame_data.scal_out_num_channels;
+
+    }
+
+    pstr_dec_data->dec_bit_buf.ptr_bit_buf_base = (UWORD8 *)inbuffer;
+    pstr_dec_data->dec_bit_buf.size = aac_dec_handle->ui_in_bytes << 3;
+    pstr_dec_data->dec_bit_buf.ptr_bit_buf_end =
+        (UWORD8 *)inbuffer + aac_dec_handle->ui_in_bytes;
+    pstr_dec_data->dec_bit_buf.ptr_read_next = (UWORD8 *)inbuffer;
+    pstr_dec_data->dec_bit_buf.bit_pos = 7;
+    pstr_dec_data->dec_bit_buf.cnt_bits = pstr_dec_data->dec_bit_buf.size;
+
+    pstr_dec_data->str_usac_data.usac_flag = aac_dec_handle->usac_flag;
+
+
+    if(preroll_frame_offset[access_units])
+    {
+        pstr_dec_data->dec_bit_buf.cnt_bits=pstr_dec_data->dec_bit_buf.size - preroll_frame_offset[access_units];
+        pstr_dec_data->dec_bit_buf.bit_pos=7-preroll_frame_offset[access_units]%8;
+        pstr_dec_data->dec_bit_buf.ptr_read_next=pstr_dec_data->dec_bit_buf.ptr_read_next+(preroll_frame_offset[access_units]/8);
+    }
+
+
+    //temp_read=ixheaacd_show_bits_buf(pstr_dec_data->dec_bit_buf,preroll_frame_offset[access_unit]);
 
     err = ixheaacd_usac_process(pstr_dec_data, num_channel_out, aac_dec_handle);
+
+    switch (pstr_dec_data->str_usac_data.sbr_ratio_idx) {
+    case 0:
+        handle->aac_config.ui_sbr_mode = 0;
+        break;
+    case 1:
+        handle->aac_config.ui_sbr_mode = 1;
+        break;
+    case 2:
+        handle->aac_config.ui_sbr_mode = 1;
+        break;
+    case 3:
+        handle->aac_config.ui_sbr_mode = 3;
+        break;
+
+    default:
+        handle->aac_config.ui_sbr_mode = 0;
+    }
+
     if (err == -1) return err;
 
-    num_samples_out = pstr_dec_data->pstr_usac_data->output_samples;
+    num_samples_out = pstr_dec_data->str_usac_data.output_samples;
 
     ixheaacd_samples_sat(outbuffer, num_samples_out, pcmsize,
-                         pstr_dec_data->pstr_usac_data->time_sample_vector,
+                         pstr_dec_data->str_usac_data.time_sample_vector,
                          out_bytes, *num_channel_out);
-#ifdef ENABLE_DRC
     pstr_audio_specific_config->str_usac_config.str_usac_dec_config
         .usac_ext_gain_payload_len =
-        pstr_dec_data->pstr_frame_data->str_audio_specific_config
+        pstr_dec_data->str_frame_data.str_audio_specific_config
             .str_usac_config.str_usac_dec_config.usac_ext_gain_payload_len;
     memcpy(
         pstr_audio_specific_config->str_usac_config.str_usac_dec_config
             .usac_ext_gain_payload_buf,
-        pstr_dec_data->pstr_frame_data->str_audio_specific_config
+        pstr_dec_data->str_frame_data.str_audio_specific_config
             .str_usac_config.str_usac_dec_config.usac_ext_gain_payload_buf,
-        pstr_dec_data->pstr_frame_data->str_audio_specific_config
+        pstr_dec_data->str_frame_data.str_audio_specific_config
                 .str_usac_config.str_usac_dec_config.usac_ext_gain_payload_len *
             sizeof(WORD8));
-#endif
+
+    access_units++;
+    preroll_units--;
+    }while(preroll_units>=0);
   }
 
   return err;