Commit 11a07714 authored by TYAGIRIS's avatar TYAGIRIS
Browse files

update as per latest main

parents b9ddc95f a31b7341

.gitlab-ci.yml

+62 −2
Original line number Diff line number Diff line 
variables:

  # note: GitLab cannot reference variables defined by users in the include ref:, we need to use a YAML anchor for this

  # see https://docs.gitlab.com/ci/yaml/includes/#use-variables-with-include for more information

  IVAS_CODEC_CI_REF: &IVAS_CODEC_CI_REF 41186736915f5c0a857ac92e8ab438c434e5247d

  IVAS_CODEC_CI_REF: &IVAS_CODEC_CI_REF main



include:

  - local: .gitlab-ci/variables.yml
@@ -62,6 +62,9 @@ workflow: 
    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'voip-be-test'

      variables:

        IVAS_PIPELINE_NAME: 'Voip BE test on $CI_COMMIT_BRANCH'

    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'renderer-framesize-be'

      variables:

        IVAS_PIPELINE_NAME: 'Renderer framesize BE test on $CI_COMMIT_BRANCH'

    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'peaq-enc-passthrough'

      variables:

        IVAS_PIPELINE_NAME: 'PEAQ encoder pass-through test: $CI_COMMIT_BRANCH'
@@ -189,6 +192,7 @@ workflow: 
.test-job-linux-needs-testv-dir:

  extends: .test-job-linux

  before_script:

    - !reference [ .job-linux, before_script ]

    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/update-scripts-repo.sh

    - if [ ! -d "$TESTV_DIR" ]; then mkdir -p $TESTV_DIR; fi

    - cp -r scripts/testv/* $TESTV_DIR/
@@ -1059,6 +1063,63 @@ check-regressions-short-dec--10db: 
    DUT_ENCODER_PATH: "$REF_ENCODER_PATH"

    MERGE_TARGET_ENCODER_PATH: "$REF_ENCODER_PATH"



check-be-between-renderer-framesizes:

  extends:

    - .test-job-linux

    # - .rules-pytest-to-main-short

  rules:

    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == "renderer-framesize-be"

  stage: test

  needs: ["build-codec-linux-make"]

  script:

    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/disable-limiter.sh

    - make clean

    - make -j

    - echo "$SHORT_TEST_SUITE"



    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/build-float-ref-and-dut-binaries.sh

    - python3 ci/remove_unsupported_testcases.py $PRM_FILES



    - exit_code=0

    - python3 -m pytest tests/codec_be_on_mr_nonselection --tb=no -v --ref_encoder_path ./IVAS_cod_ref --ref_decoder_path ./IVAS_dec --update_ref 1 --html=report-20ms.html --self-contained-html --junit-xml=report-junit-20ms.xml || exit_code=$?



    - exit_code5=0

    - exit_code10=0

    - python3 -m pytest tests/codec_be_on_mr_nonselection --tb=no -v --ref_encoder_path ./IVAS_cod_ref --ref_decoder_path ./IVAS_dec --html=report-5ms.html --self-contained-html --junit-xml=report-junit-5ms.xml --dut_fr 5 --decoder_only || exit_code5=$?

    - python3 -m pytest tests/codec_be_on_mr_nonselection --tb=no -v --ref_encoder_path ./IVAS_cod_ref --ref_decoder_path ./IVAS_dec --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

    - zero_errors10=$(cat report-junit-10ms.xml | grep -c 'errors="0"') || true

    - zero_errors=1



    - *print-results-banner

    - echo "!! Encoder command lines are in the 20ms log files only !!!"

    - if [ $exit_code -ne 0 ]; then echo "20 ms framesize run already failed with errors."; zero_errors=0; fi

    - if [ $zero_errors5 != 1 ]; then echo "run error with 5ms rendering encountered"; zero_errors=0 ; fi

    - if [ $zero_errors10 != 1 ]; then echo "run error with 10ms rendering encountered"; zero_errors=0 ; fi

    - if [ $zero_errors != 1 ]; then exit $EXIT_CODE_FAIL; fi

    - if [ $exit_code5 -ne 0 ]; then echo "Non-bitexact cases encountered with 5ms rendering!"; exit_code=1; fi

    - if [ $exit_code10 -ne 0 ]; then echo "Non-bitexact cases encountered with 10ms rendering!"; exit_code=1; fi

    - if [ $exit_code -ne 0 ]; then exit $EXIT_CODE_FAIL; fi

  artifacts:

    name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--stage-$CI_JOB_STAGE--results"

    expire_in: 1 week

    when: always

    expose_as: "pytest 5ms and 10ms vs 20ms results"

    paths:

      - report-junit-5ms.xml

      - report-5ms.html

      - report-junit-10ms.xml

      - report-10ms.html

      - report-junit-20ms.xml

      - report-20ms.html

    reports:

      junit:

        - report-junit-5ms.xml

        - report-junit-10ms.xml

        - report-junit-20ms.xml





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

# Short test jobs for running from web interface or schedule

# ---------------------------------------------------------------
@@ -2042,7 +2103,6 @@ pages: 
    - if: $UPDATE_PAGES

  script:

    - !reference [ .job-linux, before_script ]



    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/print-common-info.sh

    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/update-scripts-repo.sh

    - python3 ci/setup_pages.py

.gitlab-ci/variables.yml

+1 −0
Original line number Diff line number Diff line
@@ -63,4 +63,5 @@ variables: 
      - 'complexity'

      - 'coverage'

      - 'voip-be-test'

      - 'renderer-framesize-be'

      - 'peaq-enc-passthrough'

apps/encoder.c

+1 −6
Original line number Diff line number Diff line
@@ -758,12 +758,7 @@ int main( 
        }



        /* *** Encode one frame *** */

        if ( ( error = IVAS_ENC_EncodeFrameToSerial( hIvasEnc, pcmBuf, pcmBufSize, bitStream, &numBits

#ifdef DBG_BITSTREAM_ANALYSIS

                                                     ,

                                                     frame

#endif

                                                     ) ) != IVAS_ERR_OK )

        if ( ( error = IVAS_ENC_EncodeFrameToSerial( hIvasEnc, pcmBuf, pcmBufSize, bitStream, &numBits ) ) != IVAS_ERR_OK )

        {

            fprintf( stderr, "\nencodeFrame failed: %s\n\n", IVAS_ENC_GetErrorMessage( error ) );

            goto cleanup;

lib_com/basop32.c

+2 −2
Original line number Diff line number Diff line
@@ -3582,13 +3582,13 @@ Word16 i_mult_o( Word16 a, Word16 b, Flag *Overflow ) 
#ifdef ORIGINAL_G7231

    return a * b;

#else

    register Word32 c = a * b;

    register Word32 c = (Word32) a * b;

    return saturate_o( c, Overflow );

#endif

}

Word16 i_mult( Word16 a, Word16 b )

{

    return i_mult_o( a, b, NULL );

    return i_mult_sat( a, b );

}

Word16 i_mult_sat( Word16 a, Word16 b )

{

lib_com/basop_util.c

+20 −2
Original line number Diff line number Diff line
@@ -1062,7 +1062,6 @@ Word32 BASOP_Util_Divide3232_Scale_cadence( Word32 x, Word32 y, Word16 *s ) 
    return z;

}



#ifdef DIV32_OPT_NEWTON

Word32 div_w_newton( Word32 num, Word32 den );

/*

Table of 256 precalculated estimates to be used by the "div_w_newton"
@@ -1462,7 +1461,6 @@ Word32 BASOP_Util_Divide3232_Scale_newton( Word32 x, Word32 y, Word16 *s ) 


    return z;

}

#endif /* DIV32_OPT_NEWTON */



Word16 BASOP_Util_Divide3232_Scale( Word32 x, Word32 y, Word16 *s )

{
@@ -1918,6 +1916,26 @@ Word16 findIndexOfMinWord32( Word32 *x, const Word16 len ) 
    return indx;

}



Word16 findIndexOfMinWord64( Word64 *x, const Word16 len )

{

    Word16 i, indx;





    indx = 0;

    move16();

    FOR( i = 1; i < len; i++ )

    {

        if ( LT_64( x[i], x[indx] ) )

        {

            indx = i;

            move16();

        }

    }





    return indx;

}





Word16 imult1616( Word16 x, Word16 y )

{