Commit 78de7bd8 authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch 'ci/fix-merge-request-pipeline' into kiene/test-mr-pipeline-fix

parents 7e73513a 6ee710fd

.gitlab-ci.yml

+36 −4
Original line number Diff line number Diff line
@@ -326,10 +326,6 @@ workflow: 
    - rm -rf tests/dut tests/ref

  variables:

    USE_LTV: 0

    DUT_ENCODER_PATH: ./IVAS_cod_ref

    DUT_DECODER_PATH: ./IVAS_dec_ref

    MERGE_TARGET_ENCODER_PATH: ./IVAS_cod_ref

    MERGE_TARGET_DECODER_PATH: ./IVAS_dec_ref



.check-be-to-target-job:

  extends:
@@ -911,6 +907,9 @@ check-be-to-target-short-enc-0db: 
    TEST_SUITE: "$SHORT_TEST_SUITE_ENCODER"

    # -/-0dB

    LEVEL_SCALING: "1.0"

    # overwrite decoder with float reference one

    DUT_DECODER_PATH: "$REF_DECODER_PATH"

    MERGE_TARGET_DECODER_PATH: "$REF_DECODER_PATH"



check-be-to-target-short-enc-+10db:

  extends:
@@ -919,6 +918,9 @@ check-be-to-target-short-enc-+10db: 
    TEST_SUITE: "$SHORT_TEST_SUITE_ENCODER"

    # +10dB

    LEVEL_SCALING: "3.162"

    # overwrite decoder with float reference one

    DUT_DECODER_PATH: "$REF_DECODER_PATH"

    MERGE_TARGET_DECODER_PATH: "$REF_DECODER_PATH"



check-be-to-target-short-enc--10db:

  extends:
@@ -927,6 +929,9 @@ check-be-to-target-short-enc--10db: 
    TEST_SUITE: "$SHORT_TEST_SUITE_ENCODER"

    # -10dB

    LEVEL_SCALING: "0.3162"

    # overwrite decoder with float reference one

    DUT_DECODER_PATH: "$REF_DECODER_PATH"

    MERGE_TARGET_DECODER_PATH: "$REF_DECODER_PATH"



check-be-to-target-short-dec-0db:

  extends:
@@ -935,6 +940,9 @@ check-be-to-target-short-dec-0db: 
    TEST_SUITE: "$SHORT_TEST_SUITE"

    # +/-0dB

    LEVEL_SCALING: "1.0"

    # overwrite encoder with float reference one

    DUT_ENCODER_PATH: "$REF_ENCODER_PATH"

    MERGE_TARGET_ENCODER_PATH: "$REF_ENCODER_PATH"



check-be-to-target-short-dec-+10db:

  extends:
@@ -943,6 +951,9 @@ check-be-to-target-short-dec-+10db: 
    TEST_SUITE: "$SHORT_TEST_SUITE"

    # +10dB

    LEVEL_SCALING: "3.162"

    # overwrite decoder with float reference one

    DUT_DECODER_PATH: "$REF_DECODER_PATH"

    MERGE_TARGET_DECODER_PATH: "$REF_DECODER_PATH"



check-be-to-target-short-dec--10db:

  extends:
@@ -951,6 +962,9 @@ check-be-to-target-short-dec--10db: 
    TEST_SUITE: "$SHORT_TEST_SUITE"

    # -10dB

    LEVEL_SCALING: "0.3162"

    # overwrite decoder with float reference one

    DUT_DECODER_PATH: "$REF_DECODER_PATH"

    MERGE_TARGET_DECODER_PATH: "$REF_DECODER_PATH"



### jobs that check for regressions on non-BE testcases

check-regressions-short-enc-0db:
@@ -960,6 +974,9 @@ check-regressions-short-enc-0db: 
    TEST_SUITE: "$SHORT_TEST_SUITE_ENCODER"

    # +/-0dB

    LEVEL_SCALING: "1.0"

    # overwrite decoder with float reference one

    DUT_DECODER_PATH: "$REF_DECODER_PATH"

    MERGE_TARGET_DECODER_PATH: "$REF_DECODER_PATH"



check-regressions-short-enc-+10db:

  extends:
@@ -968,6 +985,9 @@ check-regressions-short-enc-+10db: 
    TEST_SUITE: "$SHORT_TEST_SUITE_ENCODER"

    # +10dB

    LEVEL_SCALING: "3.162"

    # overwrite decoder with float reference one

    DUT_DECODER_PATH: "$REF_DECODER_PATH"

    MERGE_TARGET_DECODER_PATH: "$REF_DECODER_PATH"



check-regressions-short-enc--10db:

  extends:
@@ -976,6 +996,9 @@ check-regressions-short-enc--10db: 
    TEST_SUITE: "$SHORT_TEST_SUITE_ENCODER"

    # -10dB

    LEVEL_SCALING: "0.3162"

    # overwrite decoder with float reference one

    DUT_DECODER_PATH: "$REF_DECODER_PATH"

    MERGE_TARGET_DECODER_PATH: "$REF_DECODER_PATH"



check-regressions-short-dec-0db:

  extends:
@@ -984,6 +1007,9 @@ check-regressions-short-dec-0db: 
    TEST_SUITE: "$SHORT_TEST_SUITE"

    # +/-0dB

    LEVEL_SCALING: "1"

    # overwrite decoder with float reference one

    DUT_DECODER_PATH: "$REF_DECODER_PATH"

    MERGE_TARGET_DECODER_PATH: "$REF_DECODER_PATH"



check-regressions-short-dec-+10db:

  extends:
@@ -992,6 +1018,9 @@ check-regressions-short-dec-+10db: 
    TEST_SUITE: "$SHORT_TEST_SUITE"

    # +10dB

    LEVEL_SCALING: "3.162"

    # overwrite decoder with float reference one

    DUT_DECODER_PATH: "$REF_DECODER_PATH"

    MERGE_TARGET_DECODER_PATH: "$REF_DECODER_PATH"



check-regressions-short-dec--10db:

  extends:
@@ -1000,6 +1029,9 @@ check-regressions-short-dec--10db: 
    TEST_SUITE: "$SHORT_TEST_SUITE"

    # -10dB

    LEVEL_SCALING: "0.3162"

    # overwrite decoder with float reference one

    DUT_DECODER_PATH: "$REF_DECODER_PATH"

    MERGE_TARGET_DECODER_PATH: "$REF_DECODER_PATH"



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

# Short test jobs for running from web interface or schedule

lib_dec/igf_dec_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -244,7 +244,7 @@ static void IGF_replaceTCXNoise_2( Word32 *in, /**< in 




    g = getSqrtWord32( L_mult( divide3232( totalNoiseNrg, rE ), 8192 /*1.0f / 4.0f Q15*/ ) ); // ((Q15 + Q15 + Q1) / 2) -> Q15

    g = shl( g, 1 );                                                                          // Q16

    g = shl_sat( g, 1 );                                                                      // Q16



    FOR( sb = start; sb < stop; sb++ )

    {

lib_rend/ivas_dirac_dec_binaural_functions_fx.c

+15 −0
Original line number Diff line number Diff line
@@ -2096,6 +2096,21 @@ static void ivas_dirac_dec_binaural_determine_processing_matrices_fx( 
        exp = sub( get_min_scalefactor( resultMtxRe_fx[0][0], resultMtxRe_fx[1][1] ), 2 );

        tmp2 = L_add( L_shl( resultMtxRe_fx[0][0], exp ), L_shl( resultMtxRe_fx[1][1], exp ) );

        q_tmp2 = add( q_res, exp );



        /*Limiting value to Q63*/

        IF( GT_16( q_tmp2, 63 ) )

        {

            tmp2 = L_shl( tmp2, sub( 63, q_tmp2 ) );

            q_tmp2 = 63;

            move16();

            IF( EQ_32( tmp2, -1 ) )

            {

                tmp2 = 0;

                move32();

                q_tmp2 = 31;

                move16();

            }

        }

        IF( LT_16( q_CrEne, q_tmp2 ) )

        {

            realizedOutputEne_fx = L_add( tmp1, L_shr( tmp2, sub( q_tmp2, q_CrEne ) ) );