merge

make -f Makefile clean

make -f Makefile -j CLANG=0

cp IVAS_cod IVAS_cod_ref

cp IVAS_dec IVAS_dec_ref

cp IVAS_rend IVAS_rend_ref

cp ISAR_post_rend ISAR_post_rend_ref

python3 scripts/prepare_combined_format_inputs.py

python3 -m pytest -q tests/codec_be_on_mr_nonselection tests/renderer_short/test_renderer.py tests/split_rendering/test_split_rendering.py -v -n auto --update_ref 1 --create_ref --keep_files --html=report_cmd.html --self-contained-html

python3 scripts/parse_commands.py report_cmd.html Readme_IVAS.txt  

rm -rf testvec

mkdir testvec

mkdir testvec/binauralRenderer_interface

mkdir testvec/testv

mkdir testvec/testv/renderer_short

mkdir testvec/testv/split_rendering        

mkdir testvec/bin    

cp -r scripts/testv/* testvec/testv

cp -r scripts/ls_layouts testvec

cp -r scripts/object_edit testvec

cp -r scripts/switchPaths testvec

cp -r scripts/trajectories testvec

cp -r scripts/binauralRenderer_interface/binaural_renderers_hrtf_data testvec/binauralRenderer_interface

cp -r tests/ref testvec/testv/ref

cp -r tests/renderer_short/ref testvec/testv/renderer_short/ref

cp -r tests/split_rendering/ref testvec/testv/split_rendering/ref

cp -r tests/split_rendering/renderer_configs testvec/testv/split_rendering/renderer_configs

cp -r tests/split_rendering/error_patterns testvec/testv/split_rendering/error_patterns

python3 scripts/cleanup_26252.py

cp -r tests/conformance-test testvec/

cp Readme_IVAS_dec.txt testvec

cp Readme_IVAS_enc.txt testvec

cp Readme_IVAS_rend.txt testvec

cp Readme_IVAS_JBM_dec.txt testvec

cp Readme_IVAS_ISAR_dec.txt testvec

cp Readme_IVAS_ISAR_post_rend.txt testvec

cp IVAS_cod testvec/bin

cp IVAS_dec testvec/bin

cp IVAS_rend testvec/bin

cp ISAR_post_rend testvec/bin

#define NONBE_MDCT_ST_DTX_FIX_SUBOPT_SPATIAL_CNG       /* FhG: Fix MDCT-Stereo comfort noise for certain noise types */

#define NONBE_FIX_NONBE_BETWEEN_OPTIMIZATION_LEVELS    /* FhG: fix non-BE in DFT stereo encoder between optimization levels */

#define NONBE_FIX_NONBE_BETWEEN_OPTIMIZATION_LEVELS_2  /* FhG: fix even more non-BEnesses */

<<<<<<< HEAD

/*#define NONBE_1324_TC_BUFFER_MEMOERY_KEEP*/               /* VA: issue 1324: do not reset TSM memory in JBM bitrate switching */

#define FIX_1330_JBM_MEMORY_FIX                         /* VA: basop issue: 2179 fix non-BE difference in FIX_1330_JBM_MEMORY */

=======

#define NONBE_1324_TC_BUFFER_MEMOERY_KEEP              /* VA: issue 1324: do not reset TSM memory in JBM bitrate switching */

>>>>>>> remotes/origin/main

#define NONBE_1380_OMASA_BUILD_DIFF                     /* Nokia: Fix for issue #1380: Large differences in OMASA output between Debug and Release builds */

/* ##################### End NON-BE switches ########################### */

cmake_minimum_required(VERSION 3.5)

cmake_minimum_required(VERSION 3.10)

project(generate_crend_ivas_tables)

    ${IVAS_TRUNK_REND_PATH}/ivas_rom_rend.h

)

# require to be bit exact with main branch

if(MSVC)

    add_compile_options("/fp:precise")

else()

    add_compile_options("-ffp-contract=off")

endif()

add_library(${PROJECT_NAME}_lib STATIC ${SOURCE_FILES_C} ${SOURCE_FILES_H})

add_executable(${PROJECT_NAME} generate_crend_ivas_tables_from_sofa.c)