Commit 529e7bce authored by bayers's avatar bayers
Browse files

Merge remote-tracking branch 'remotes/origin/main' into... 

Merge remote-tracking branch 'remotes/origin/main' into 1021-msan-use-of-uninitialized-value-in-ism4-rate-switching-with-jbm
parents 67ef955e 49573a9a

.gitlab-ci.yml

+5 −2
Original line number Diff line number Diff line
@@ -549,6 +549,8 @@ pytest-compare-20ms-and-5ms-rendering: 
    - python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR -v --update_ref 1 -m create_ref_part2

    ### run pytest

    - exit_code=0

    - exit_code5=0

    - exit_code10=0

    - python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR -v --html=report-5ms.html --self-contained-html --junit-xml=report-junit-5ms.xml --dut_fr 5 --decoder_only || exit_code5=$?

    - python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR -v --html=report-10ms.html --self-contained-html --junit-xml=report-junit-10ms.xml --dut_fr 10 --decoder_only || exit_code10=$?

    - zero_errors5=$(cat report-junit-5ms.xml | grep -c 'errors="0"') || true
@@ -2040,8 +2042,9 @@ coverage-test-on-main-scheduled: 
    - python3 tests/create_short_testvectors.py

    - python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR -v -n auto --update_ref 1 -m create_ref --ref_encoder_path ./IVAS_cod --ref_decoder_path ./IVAS_dec

    - python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR -v -n auto --update_ref 1 -m create_ref_part2 --ref_encoder_path ./IVAS_cod --ref_decoder_path ./IVAS_dec

    - python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR -v --dut_encoder_path ./IVAS_cod --dut_decoder_path ./IVAS_dec --dut_fr 5 --decoder_only

    - python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR -v --dut_encoder_path ./IVAS_cod --dut_decoder_path ./IVAS_dec --dut_fr 10 --decoder_only

    # need to ignore non-zero exit codes as limiter is active and thus the different framesiszes will not be BE in all cases

    - python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR -v --dut_encoder_path ./IVAS_cod --dut_decoder_path ./IVAS_dec --dut_fr 5 --decoder_only || true

    - python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR -v --dut_encoder_path ./IVAS_cod --dut_decoder_path ./IVAS_dec --dut_fr 10 --decoder_only || true

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

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

    - lcov -c -d obj -o coverage_stv.info # extract coverage of short test vectors here

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -171,6 +171,7 @@ 
#define NONBE_FIX_1004_USAN_DTX_MASA_NO_DIRS                  /* Nokia: fix USAN error caused by non-setting of correctly the number of MASA directions in DTX */

#define NONBE_FIX_1014_1015_1016_OSBA_JBM_STEREO              /* FhG: issues #1014, #1015, #1016: fix tc buffer info update in the discrete ism renderer */

#define NONBE_FIX_987_PARAMC_BINAURAL_REVERB_RENDERING       /* FhG: issue 987: solution b: downmix HOA3 to stereo a input for the reverberator */

#define NONBE_FIX_1010_STEREO_CNG_DIV_BY_ZERO                 /* Eri: Issue 1010: Division by zero in Stereo CNG */

#define NONBE_FIX_1021_ISM_BRIR_RS_FLUSH                      /* FhG: issue #1021: fix ISM with JBM and RS renderer flushing*/



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

lib_dec/ivas_stereo_dft_dec.c

+8 −0
Original line number Diff line number Diff line
@@ -2947,7 +2947,11 @@ void stereo_dft_dec_smooth_parameters( 
        if ( hStereoDft->frame_sid_nodata )

        {

            /* set new xfade target if new itd received */

#ifdef NONBE_FIX_1010_STEREO_CNG_DIV_BY_ZERO

            if ( hStereoDft->ipd_xfade_counter < STEREO_DFT_ITD_CNG_XFADE )

#else

            if ( hStereoDft->gipd[k + k_offset] != hStereoDft->ipd_xfade_target )

#endif

            {

                if ( ( hStereoDft->gipd[k + k_offset] - hStereoDft->ipd_xfade_prev ) > EVS_PI )

                {
@@ -2993,7 +2997,11 @@ void stereo_dft_dec_smooth_parameters( 
        if ( hStereoDft->frame_sid_nodata )

        {

            /* set new xfade target if new itd received */

#ifdef NONBE_FIX_1010_STEREO_CNG_DIV_BY_ZERO

            if ( hStereoDft->itd_xfade_counter < STEREO_DFT_ITD_CNG_XFADE )

#else

            if ( hStereoDft->itd[k + k_offset] != hStereoDft->itd_xfade_target )

#endif

            {

                hStereoDft->itd_xfade_target = hStereoDft->itd[k + k_offset];

                hStereoDft->itd_xfade_step = ( hStereoDft->itd_xfade_target - hStereoDft->itd_xfade_prev ) / ( STEREO_DFT_ITD_CNG_XFADE - hStereoDft->itd_xfade_counter );