Update to v0.1.7 from upstream project

This CL is a squashed commit of the following CLs from
upstream/main 029ef1c6bdee03ccee32528ef3088f48ad5970d3

029ef1c cmake: Added macros for x86_64 for future use
79e7fec Encoder updates (#42)
d5a1759 DRC API and testbench updates (#41)
917448c Encoder Fuzzer updates (#40)
eec1f1c Encoder enhancements for DRC (#39)
af3f10a Encoder enhancements for USAC along with DRC (#38)
797de4d USAC along with DRC support for libxaac encoder (#37)
e78e1c4 Code refactoring and minor fixes (#36)
3dfbcff Merge pull request #35 from ittiam-systems/document_changes
7e39853 Minor edits
d530b66 Added description for MPEG-D DRC
174609e libxaac documentation edits
b2e7201 Encoder Enhancements (#34)
088122e Combined Workspace for Encoder and Decoder (#33)
48a1ff2 Merge pull request #32 from ittiam-systems/esbr_switch
2a43ff9 ESBR command line switch support for xHEAAC decoder
f5242f4 Merge pull request #31 from ittiam-systems/dec_restruct
ae104f0 Restructuring of Decoder
7fd0b9f Merge pull request #30 from ittiam-systems/cmake_updates
0233db3 cleanup cmake files
0198a4c Merge pull request #29 from ittiam-systems/oob_fix
18930ce Fix for OOB issue in MPS module
6a21d80 Fix for crash observed with MSVS x64 build (#28)

Bug: 294914565
Test: xaac_dec_fuzzer
Test: xaac_enc_fuzzer


Change-Id: I0cc0620f6fcb2d0dd3f1a09a138cb1a9031a5389

1 files changed, 7 insertions, 7 deletions

diff --git a/decoder/ixheaacd_decode_main.c b/decoder/ixheaacd_decode_main.c
index 802f7fa..982a6aa 100644
--- a/decoder/ixheaacd_decode_main.c
+++ b/decoder/ixheaacd_decode_main.c
@@ -19,8 +19,8 @@
 */
 #include <stdlib.h>
 #include <string.h>
-#include "ixheaacd_type_def.h"
-#include "ixheaacd_error_standards.h"
+#include "ixheaac_type_def.h"
+#include "ixheaac_error_standards.h"
 #include "ixheaacd_memory_standards.h"
 #include "ixheaacd_sbrdecsettings.h"
 #include "ixheaacd_sbr_scale.h"
@@ -57,7 +57,7 @@
 #include "ixheaacd_mps_struct_def.h"
 #include "ixheaacd_mps_res_rom.h"
 #include "ixheaacd_mps_aac_struct.h"
-#include "ixheaacd_constants.h"
+#include "ixheaac_constants.h"
 #include "ixheaacd_mps_dec.h"
 #include "ixheaacd_struct_def.h"
 #include "ixheaacd_bitbuffer.h"
@@ -69,14 +69,14 @@
 #include "ixheaacd_info.h"
 #include "ixheaacd_sbrdecoder.h"
 #include "ixheaacd_mps_polyphase.h"
-#include "ixheaacd_sbr_const.h"
+#include "ixheaac_sbr_const.h"
 #include "ixheaacd_main.h"
 #include "ixheaacd_arith_dec.h"
 #include "ixheaacd_config.h"
 #include "ixheaacd_struct.h"
 #include "ixheaacd_create.h"
 #include "ixheaacd_dec_main.h"
-#include "ixheaacd_error_standards.h"
+#include "ixheaac_error_standards.h"
 #include "ixheaacd_headerdecode.h"
 #include "ixheaacd_error_codes.h"
 VOID ixheaacd_samples_sat(WORD8 *outbuffer, WORD32 num_samples_out,
@@ -392,7 +392,7 @@ WORD32 ixheaacd_dec_main(VOID *temp_handle, WORD8 *inbuffer, WORD8 *outbuffer,
     }
     pstr_dec_data->str_usac_data.usac_flag = aac_dec_handle->usac_flag;
     pstr_dec_data->str_usac_data.esbr_hq = handle->aac_config.ui_hq_esbr;
-    pstr_dec_data->str_usac_data.enh_sbr = handle->aac_config.ui_enh_sbr;
+    pstr_dec_data->str_usac_data.enh_sbr = 1;
     pstr_dec_data->str_usac_data.enh_sbr_ps = handle->aac_config.ui_enh_sbr_ps;
     if (pstr_dec_data->dec_bit_buf.size > pstr_dec_data->dec_bit_buf.max_size)
       pstr_dec_data->dec_bit_buf.max_size = pstr_dec_data->dec_bit_buf.size;
@@ -496,7 +496,7 @@ WORD32 ixheaacd_dec_main(VOID *temp_handle, WORD8 *inbuffer, WORD8 *outbuffer,
 
       pstr_dec_data->str_usac_data.usac_flag = aac_dec_handle->usac_flag;
       pstr_dec_data->str_usac_data.esbr_hq = handle->aac_config.ui_hq_esbr;
-      pstr_dec_data->str_usac_data.enh_sbr = handle->aac_config.ui_enh_sbr;
+      pstr_dec_data->str_usac_data.enh_sbr = 1;
       pstr_dec_data->str_usac_data.enh_sbr_ps = handle->aac_config.ui_enh_sbr_ps;
 
       if (preroll_frame_offset[access_units] &&