Commit 2b55f9db authored by emerit's avatar emerit
Browse files

Merge branch 'main' into 744-fix-sofa-to-rom-tables-and-binaural-binary-files

parents 6286d63b 4473003c

.gitlab-ci.yml

+8 −3
Original line number Diff line number Diff line
@@ -159,6 +159,12 @@ stages: 
.check-commits-behind-count-in-compare-jobs: &check-commits-behind-count-in-compare-jobs

  - if [ $commits_behind_count -ne 0 ]; then echo "Your branch is not up-to-date with main -> Compare tests will not run as they can contain false negatives this way.\nMain might have changed during your pipeline run. Run 'git merge origin/main' to update."; exit 1; fi



.copy-ltv-files-to-testv-dir: &copy-ltv-files-to-testv-dir

    - cp "$LTV_DIR"/*.wav scripts/testv/

    - cp "$LTV_DIR"/*.met scripts/testv/

    - cp "$LTV_DIR"/*.csv scripts/testv/





# ---------------------------------------------------------------

# Job templates

# ---------------------------------------------------------------
@@ -1233,9 +1239,7 @@ test-long-self-test: 
    ### prepare pytest



    # Copy test vectors from LTV to TESTV

    - cp "$LTV_DIR"/*.wav scripts/testv/

    - cp "$LTV_DIR"/*.met scripts/testv/

    - cp "$LTV_DIR"/*.csv scripts/testv/

    - *copy-ltv-files-to-testv-dir



    # create references

    - exit_code_ref=0
@@ -1519,6 +1523,7 @@ coverage-test-on-main-scheduled: 
  script:

    - *print-common-info

    - *update-ltv-repo

    - *copy-ltv-files-to-testv-dir

    - make GCOV=1 -j

    - cp IVAS_rend IVAS_rend_ref # Copy exec to be able to run renderer script

    - python3 tests/create_short_testvectors.py

lib_com/options.h

+2 −0
Original line number Diff line number Diff line
@@ -160,6 +160,8 @@ 
#define FIX_863_REMOVE_REDUNDANCIES_OMASA               /* Nokia/VA & Orange : Issue 863: Remove redundancies in stereo_classifier for OMASA */

#define FIX_20_MS_FRAME_LEN_TABLES_CONVERTER            /* Orange : generate_tables_convereter tools can generate rom for 5 and 20 ms frame length */

#define FIX_HOA_BRIR_EXT_RENDERER                       /* Orange : allow to create and load hoa brir binary files for renderer */

#define FIX_863_REMOVE_REDUNDANCIES_OMASA               /* Nokia/VA: Issue 863: Remove redundancies in stereo_classifier for OMASA */

#define FIX_879_USAN_ERROR_IN_MASA_DECODING             /* FhG: Issue 879 : avoid arithmetic with NULL pointer in the DirAC decoder to fix USAN error */



/* #################### End BE switches ################################## */

lib_dec/ivas_dirac_dec.c

+4 −0
Original line number Diff line number Diff line
@@ -1812,7 +1812,11 @@ void ivas_dirac_dec_render_sf( 
    DirAC_mem = hDirACRend->stack_mem;



    reference_power = DirAC_mem.reference_power;

#ifdef FIX_879_USAN_ERROR_IN_MASA_DECODING

    reference_power_smooth = ( DirAC_mem.reference_power == NULL ) ? NULL : DirAC_mem.reference_power + hSpatParamRendCom->num_freq_bands;

#else

    reference_power_smooth = DirAC_mem.reference_power + hSpatParamRendCom->num_freq_bands;

#endif

    onset_filter = DirAC_mem.onset_filter;

    onset_filter_subframe = ( DirAC_mem.onset_filter == NULL ) ? NULL : DirAC_mem.onset_filter + hSpatParamRendCom->num_freq_bands;

scripts/ubsan.supp

+0 −1
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ implicit-signed-integer-truncation:pvq_core_dec.c 
implicit-signed-integer-truncation:pvq_core_enc.c

implicit-signed-integer-truncation:tcq_position_arith.c

implicit-signed-integer-truncation:tools.c

pointer-overflow:ivas_dirac_dec.c

shift-base:basop32.c

shift-base:enh40.c

shift-base:enh40.h