Commit ca1747dc authored by Vladimir Malenovsky's avatar Vladimir Malenovsky
Browse files

Merge branch 'main' into test_wmc_tool_v15

parents f2590685 a8f576ed

.gitlab-ci.yml

+3 −2
Original line number Diff line number Diff line
@@ -1371,7 +1371,7 @@ sanitizer-test-masa: 
    - if: $SANITIZER_SCHEDULE_A

      when: delayed

      start_in: 21 hours

  timeout: 5 hours

  timeout: 7 hours

  script:

    - *update-ltv-repo

    - python3 ci/run_scheduled_sanitizer_test.py MASA $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL EXT --tests $SANITIZER_TESTS
@@ -1515,7 +1515,7 @@ coverage-test-on-main-scheduled: 
  rules:

    # only run in scheduled pipeline that passes this env vars

    - if: $COVERAGE_TEST

  timeout: 4 hours

  timeout: 3 hours

  script:

    - *print-common-info

    - *update-ltv-repo
@@ -1527,6 +1527,7 @@ coverage-test-on-main-scheduled: 
    - python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR/test_param_file.py -v -n auto --update_ref 1 -m create_ref --param_file scripts/config/self_test_evs.prm --ref_encoder_path ./IVAS_cod --ref_decoder_path ./IVAS_dec

    - bash ci/smoke_test.sh coverage

    - python3 -m pytest -q -n auto tests/renderer/test_renderer_be_comparison.py

    - python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR/test_param_file.py -v -n auto --update_ref 1 -m create_ref --param_file scripts/config/self_test_ltv.prm --ref_encoder_path ./IVAS_cod --ref_decoder_path ./IVAS_dec

    - bash ci/ivas_voip_be_test.sh coverage

    - lcov -c -d obj -o coverage.info

    - commit_sha=$(git rev-parse HEAD)

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ 
#define NONBE_FIX_861_MASA_CRASH_STEREO_SWITCHING             /* VA: issue 861: fix MASA 2TC crash when switching from MDCT stereo to TD/DFT stereo */

#define BE_FIX_867_PARAMC_RECONFIG                            /* FhG: issue #867: fix ParamMC CLDFB buffer dealloc when reconfiguring */

#define NONBE_FIX_850_MASA_HBR_META_RATIO_DECODING            /* Nokia: issue #850: Fixes rare non-valid diffuseness and energy ratio values in 2dir MASA. */



#define NONBE_FIX_MDCT_STEREO_DTX_MONO_OUT                    /* FhG: fix clicks in DTX -> active transition frames in MDCT-Stereo with mono output */



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

lib_dec/ivas_stereo_switching_dec.c

+7 −0
Original line number Diff line number Diff line
@@ -1302,6 +1302,13 @@ void synchro_synthesis( 
            }

        }



#ifdef NONBE_FIX_MDCT_STEREO_DTX_MONO_OUT

        if ( hCPE->element_mode == IVAS_CPE_MDCT && hCPE->nchan_out == 1 && !is_DTXrate( hCPE->element_brate ) && is_DTXrate( hCPE->last_element_brate ) )

        {

            mvr2r( sts[0]->prev_synth_buffer, sts[1]->prev_synth_buffer, delay_comp_TD );

        }

#endif



        nChannels = ( hCPE->element_mode == IVAS_CPE_MDCT ) ? 2 : hCPE->nchan_out;

        for ( n = 0; n < nChannels; n++ )

        {

scripts/ubsan.supp

+0 −3
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ alignment:hrtf_file_reader.c 
bounds:dec_acelp.c

bounds:enc_acelp.c

bounds:enc_gain.c

bounds:ivas_spar_decoder.c

bounds:trans_direct.c

bounds:trans_inv.c

implicit-integer-sign-change:ACcontextMapping.c
@@ -17,7 +16,6 @@ implicit-integer-sign-change:enc_prm.c 
implicit-integer-sign-change:enh40.c

implicit-integer-sign-change:inov_dec.c

implicit-integer-sign-change:inov_enc.c

implicit-integer-sign-change:ivas_mdct_core_dec.c

implicit-integer-sign-change:jbm_jb4sb.c

implicit-integer-sign-change:jbm_pcmdsp_apa.c

implicit-integer-sign-change:cod4t64_fast.c
@@ -36,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

null:ivas_dirac_com.c

pointer-overflow:ivas_dirac_dec.c

shift-base:basop32.c

shift-base:enh40.c