Commit 2cea86be authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch 'main' into 3gpp_issue_1258_fix

parents 81b0eae0 b1680a6d

.gitlab-ci.yml

+10 −3
Original line number Diff line number Diff line
@@ -552,10 +552,17 @@ stages: 
    - *update-scripts-repo

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

    - python3 ci/remove_unsupported_testcases.py $PRM_FILES

    - *build-reference-and-dut-binaries



    - *build-reference-binaries

    - set -euxo pipefail

    - make_args="CLANG=$CLANG_NUM"

    - if [[ $CLANG_NUM == 3 ]]; then

    -   export UBSAN_OPTIONS="suppressions=scripts/ubsan_basop.supp,report_error_type=1"

    -   python3 scripts/basop_create_ignorelist_for_ubsan.py

    -   make_args="$make_args IGNORELIST=1"

    - fi

    - make clean

    - make -j CLANG=$CLANG_NUM

    - if [[ $CLANG_NUM == 3 ]]; then export UBSAN_OPTIONS="suppressions=scripts/ubsan_basop.supp,report_error_type=1"; fi

    - make -j $make_args

    - testcase_timeout=$TESTCASE_TIMEOUT_LTV_SANITIZERS

    - python3 -m pytest $TEST_SUITE -v --tb=no --update_ref 1 --html=report.html --self-contained-html --junit-xml=report-junit.xml --testcase_timeout $testcase_timeout --ref_encoder_path $DUT_ENCODER_PATH --ref_decoder_path $DUT_DECODER_PATH

  artifacts:

Makefile

+6 −1
Original line number Diff line number Diff line
@@ -86,6 +86,11 @@ CFLAGS += -fsanitize=$(usan_checks) 
CFLAGS  += -fsanitize-recover=$(usan_checks) 

LDFLAGS += -fsanitize=$(usan_checks)

LDFLAGS += -fsanitize-recover=$(usan_checks)



ifeq "$(IGNORELIST)" "1"

CFLAGS  += -fsanitize-ignorelist=ubsan_ignorelist.txt

LDFLAGS += -fsanitize-ignorelist=ubsan_ignorelist.txt

endif

endif



ifeq "$(RELEASE)" "1"

lib_com/ivas_prot_fx.h

+10 −9
Original line number Diff line number Diff line
@@ -3346,8 +3346,9 @@ void mctStereoIGF_enc_fx( 
    Word32 *orig_spectrum_fx[MCT_MAX_CHANNELS][2],       /* i  : MDCT spectrum for ITF                      */

    Word16 q_origSpec,                                   /* i  : Q for MDCT spectrum                        */

    Word32 powerSpec_fx[MCT_MAX_CHANNELS][L_FRAME48k],   /* i/o: MDCT^2 + MDST^2 spectrum,or estimate       */

    Word32 *powerSpecMsInv_fx[MCT_MAX_CHANNELS][NB_DIV], /* i  : same as above but for inverse spect.*/

    Word16 q_powerSpec[MCT_MAX_CHANNELS],                /* i  : Q for powSpec_fx and powSpecMsInv_fx*/

    Word16 q_powerSpec[MCT_MAX_CHANNELS],                /* i  : Q for powSpec_fx                           */

    Word32 *powerSpecMsInv_fx[MCT_MAX_CHANNELS][NB_DIV], /* i  : same as powerSpec_fx but for inverse spect.*/

    Word16 q_powerSpecMsInv[MCT_MAX_CHANNELS],           /* i  : Q for powSpecMsInv_fx                      */

    Word32 *inv_spectrum_fx[MCT_MAX_CHANNELS][NB_DIV],   /* i  : inverse spectrum                           */

    const Word16 sp_aud_decision0[MCT_MAX_CHANNELS]      /* i  : speech audio decision                      */

);

lib_enc/igf_enc.c

+2 −2
Original line number Diff line number Diff line
@@ -943,9 +943,9 @@ static void IGF_CalculateEnvelope_ivas_fx( 
                move16();

                sfbEnergyR = add_sat( EPSILON_FX, BASOP_Util_Divide3216_Scale( sum2_32_fx( pMDCTSpectrum_fx + swb_offset[sfb], width, &tmp_e ) /*exp: tmp_e*/, width, &sfbEnergyR_e ) ); // sfbEnergyR_e

                sfbEnergyR_e = add( sfbEnergyR_e, add( tmp_e, -15 ) );

                gain = sfbEnergyR; // gain_e

                gain = L_shl( sfbEnergyR, 16 ); // gain_e

                move32();

                gain_e = add( sfbEnergyR_e, 16 );

                gain_e = sfbEnergyR_e;



                IF( element_mode > EVS_MONO )

                {

lib_enc/ivas_lfe_enc.c

+4 −3
Original line number Diff line number Diff line
@@ -199,12 +199,13 @@ static void ivas_lfe_enc_quant_fx( 
                q_lfe_abs_sum = sub( q_lfe_abs_sum, q_tmp );

            }



            tmp = BASOP_Util_Divide3232_Scale( max_value, W_extract_l( lfe_abs_sum ), &q_tmp );

            tmp = L_shl( tmp, sub( q_lfe_abs_sum, sub( 15, q_tmp ) ) ); /* Q0 (max_value / lfe_abs_sum) */

            tmp = L_deposit_h( BASOP_Util_Divide3232_Scale( max_value, W_extract_l( lfe_abs_sum ), &q_tmp ) );

            // tmp = L_shl( tmp, sub( q_lfe_abs_sum, sub( 15, q_tmp ) ) ); /* Q0 (max_value / lfe_abs_sum) */

            q_tmp = sub( Q16, sub( q_lfe_abs_sum, sub( 15, q_tmp ) ) );



            /* log2_f(max_value / lfe_abs_sum) -> Q25 */

            tmp = BASOP_Util_Log2( tmp );

            tmp = L_add( tmp, 1040187392 ) /* (31<<25) -> 1040187392 */; /* Q25 */

            tmp = L_add( tmp, L_shl( sub( Q31, q_tmp ), Q25 ) ) /* (31<<25) -> 1040187392 */; /* Q25 */



            /* IVAS_LFE_SHIFTS_PER_DOUBLE * log2_f(max_value / lfe_abs_sum) */

            tmp = Mpy_32_16_1( tmp, IVAS_LFE_SHIFTS_PER_DOUBLE ); /* 25-15 -> Q10 */