Commit 9952997c authored by Jouni Paulus's avatar Jouni Paulus
Browse files

Merge remote-tracking branch 'refs/remotes/origin/main' into nokia/object-editing-interface 

# Conflicts:
#	lib_rend/ivas_dirac_dec_binaural_functions.c
parents f782d43e f5c8b410

.gitignore

+75 −0
Original line number Diff line number Diff line
@@ -88,3 +88,78 @@ coan_out_* 
/scripts/mem_analysis_enc_STEREO_sw.csv

/scripts/mem_analysis_enc_STEREO_16k4_DTX.csv

*.pwv

/dcr_ism1

/bwe_clicks_ism1

/BWD_issue

/.ipynb_checkpoints

/scripts/.ipynb_checkpoints

/scripts/wmops_analysis

/scripts/wmops_analysis_new

/tcx_hq_problem_ism1

/scripts/dly_error_profiles/dly_profile_19_.dat

/build.txt

/bit.64k

/bit.32k

/bit

/binaural_loudness.ipynb

/tmp.txt

/syn.wav

/syn.ref

/syn.64k.0.csv

/syn.64k

/syn.32k

/stvST32c_-stereo_32000_32.bit

/split_renderer_config_768_3dof_cldfbpc.txt

/split_out_sba_lcld_20ms_out.wav

/split_out_sba_lcld_20ms.pkt

/split_out_mc_lc3plus_20ms_out.wav

/split_out_mc_lc3plus_20ms.pkt

/run_ivas_codec.sh

/report.html

/report-junit.xm

/out.wav

/ltv48_1ISM.cut14.wav.0.csv

/ltv48_1ISM.cut14.pcm

/ltv48_1ISM.cut14.dec.pcm.0.csv

/ltv48_1ISM.cut14.64k.dec.pcm.0.csv

/ltv48_1ISM.cut14.64k.dec.pcm

/ltv48_1ISM.cut14.32k.dec.pcm

/IvasBuilder.txt

/ivas.192

/ism_loudness_stv48_48kHz.md

/ism_loudness_stv48_32kHz.md

/ism_loudness_sel48_48kHz.md

/ism_loudness_old.xlsx

/ism_loudness_ltv48_ISM4.md

/ism_loudness_ltv48_ISM3.md

/ism_loudness_ltv48_ISM2.md

/ism_loudness_ltv48_ISM1.md

/ism_loudness_ltv48_48kHz.md

/ism_loudness.xlsx

/ism_loudness.py

/HOA2_to_BINAURAL_ROOM_REVERBNone_rend_config_combined_20msNone_0-1000_2-500_1-500.wav

/git_blame_string.sh

/get_license_table.py

/enc_out_mc.pkt

/enc_out.pkt

/cut_ism.py

/scripts/Vlad_mergeNewsletters.py

/scripts/Vlad_extract_max_num_ind.py

/scripts/tables_obj.txt

/scripts/tables_exe.txt

/scripts/requirements.txt

/scripts/parseNewsletterWmops.py

/scripts/output.xlsx

/scripts/functions_obj.txt

/scripts/functions_exe.txt

/scripts/dep_tree.txt

/scripts/cmplx_evs_in_ivas.xlsx

/scripts/bit

/scripts/binaural_loudness.ipynb

/scripts/config/Vlad_self_test_ltv.prm

/scripts/config/Vlad_self_test.prm

/scripts/config/Vlad_ci_linux_ltv.json

/scripts/config/Vlad_ci_linux.json

/cmake-build

/bit.fix

/syn

.gitlab-ci.yml

+190 −165

File changed.

Preview size limit exceeded, changes collapsed.

CMakeLists.txt

+2 −2
Original line number Diff line number Diff line
@@ -74,14 +74,14 @@ if(UNIX) 
      set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=address")

    elseif("${CLANG}" MATCHES "3" OR "${CLANG}" MATCHES "usan")

      # NOTE: keep in sync with list in Makefile

      set(USAN_CHECKS_ENABLE

      set(USAN_CHECKS_LIST

        undefined # Default checks

        # Extra checks

        float-divide-by-zero

        implicit-conversion

        local-bounds

      )

      list(JOIN USAN_CHECKS_ENABLE "," USAN_CHECKS_ENABLE)

      string(JOIN , USAN_CHECKS_ENABLE ${USAN_CHECKS_LIST})



      set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=${USAN_CHECKS_ENABLE} -fsanitize-recover=${USAN_CHECKS_ENABLE}")

      set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=${USAN_CHECKS_ENABLE} -fsanitize-recover=${USAN_CHECKS_ENABLE}")

Workspace_msvc/lib_com.vcxproj

+1 −0
Original line number Diff line number Diff line
@@ -205,6 +205,7 @@ 
    <ClCompile Include="..\lib_com\ivas_mdct_imdct.c" />

    <ClCompile Include="..\lib_com\ivas_mdft_imdft.c" />

    <ClCompile Include="..\lib_com\ivas_omasa_com.c" />

    <ClCompile Include="..\lib_com\ivas_osba_com.c" />

    <ClCompile Include="..\lib_com\ivas_pca_tools.c" />

    <ClCompile Include="..\lib_com\ivas_qmetadata_com.c" />

    <ClCompile Include="..\lib_com\ivas_qspherical_com.c" />

Workspace_msvc/lib_com.vcxproj.filters

+4 −1
Original line number Diff line number Diff line
@@ -469,6 +469,9 @@ 
    <ClCompile Include="..\lib_com\ivas_lfe_com.c">

      <Filter>common_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_com\ivas_osba_com.c">

      <Filter>common_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_com\ivas_rotation_com.c" />

  </ItemGroup>

  <ItemGroup>