Commit 760c0943 authored by Fabian Bauer's avatar Fabian Bauer
Browse files

Merge branch 'main' into... 

Merge branch 'main' into 1310-complexity-remaining-complexity-overhead-for-osba-decoding-follow-up-issue-to-1072
parents 9c109228 4f73bc08

.gitlab-ci.yml

+37 −10
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ variables: 
  INSTR_DIR: "scripts/c-code_instrument"

  BUILD_WITH_DEBUG_MODE_INFO: ""

  ENCODER_TEST: ""

  DELTA_ODG: ""

  COMPARE_DMX: ""

  SKIP_REGRESSION_CHECK: ""

  MANUAL_PIPELINE_TYPE:
@@ -50,6 +51,7 @@ variables: 
      - 'complexity'

      - 'coverage'

      - 'voip-be-test'

      - 'peaq-enc-passthrough'





default:
@@ -101,6 +103,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 == 'peaq-enc-passthrough'

      variables:

        IVAS_PIPELINE_NAME: 'PEAQ encoder pass-through test: $CI_COMMIT_BRANCH'

    - if: $CI_PIPELINE_SOURCE == 'schedule' # Scheduled in any branch

      variables:

        IVAS_PIPELINE_NAME: 'Scheduled pipeline: $CI_COMMIT_BRANCH'
@@ -344,14 +349,17 @@ stages: 
    - *build-and-create-reference-outputs



    - comp_args="--mld --ssnr --odg"

    - if [ "$ENCODER_TEST" = "true" ]; then

    -   comp_args="${comp_args} --enc_stats"

    - fi



    - summary_args="MLD DIFF SSNR ODG"

    - REPORT_ARG=""

    - if [ "$ENCODER_TEST" = "true" ]; then comp_args="${comp_args} --enc_stats"; fi

    - if [ "$DELTA_ODG" = "true" ]; then comp_args="${comp_args} --odg_bin"; summary_args="${summary_args} DELTA_ODG"; REPORT_ARG="--delta_odg"; fi



    # DMX comparison only in manual job with no other metrics

    - if [ "$COMPARE_DMX" = "true" ]; then

    -   comp_args="--compare_enc_dmx"

    - fi



    - echo "$comp_args"



    ### run pytest
@@ -359,10 +367,10 @@ stages: 
    - python3 -m pytest --tb=no $TEST_SUITE -v --create_cut --html=report.html --self-contained-html --junit-xml=report-junit.xml $comp_args -n auto --testcase_timeout $testcase_timeout --ref_encoder_path $REF_ENCODER_PATH --ref_decoder_path $REF_DECODER_PATH --dut_encoder_path $DUT_ENCODER_PATH --dut_decoder_path $DUT_DECODER_PATH || exit_code=$?

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



    - python3 scripts/parse_xml_report.py report-junit.xml $CSV_ARTIFACT_NAME

    - python3 scripts/parse_xml_report.py report-junit.xml $CSV_ARTIFACT_NAME $REPORT_ARG

    - mkdir $IMAGES_ARTIFACT_NAME

    - for MEASURE in MLD DIFF SSNR ODG;do python3 scripts/create_histogram_summary.py $CSV_ARTIFACT_NAME $IMAGES_ARTIFACT_NAME/summary_"$MEASURE".csv $IMAGES_ARTIFACT_NAME/summary_"$MEASURE".png --measure $MEASURE; done

    - python3 ci/basop-pages/create_summary_page.py $SUMMARY_HTML_ARTIFACT_NAME $CI_JOB_ID $CI_JOB_NAME

    - for MEASURE in $summary_args;do python3 scripts/create_histogram_summary.py $CSV_ARTIFACT_NAME $IMAGES_ARTIFACT_NAME/summary_"$MEASURE".csv $IMAGES_ARTIFACT_NAME/summary_"$MEASURE".png --measure $MEASURE; done

    - python3 ci/basop-pages/create_summary_page.py $SUMMARY_HTML_ARTIFACT_NAME $CI_JOB_ID $CI_JOB_NAME --measures $summary_args



    - if [ $USE_LTV -eq 1 ] && [ "$CI_COMMIT_BRANCH" == "$CI_DEFAULT_BRANCH" ]; then

    -    id_previous=$(python3 ci/get_id_of_last_job_occurence.py $CI_DEFAULT_BRANCH $CI_JOB_NAME $CI_PROJECT_ID)
@@ -491,7 +499,7 @@ stages: 


    ### compare the two csv files for regressions

    - regressions_found=0

    - python3 scripts/basop_check_for_changes_in_testcases.py --xml_report $XML_REPORT_BRANCH $CSV_MAIN $CSV_BRANCH || regressions_found=$?

    - python3 scripts/basop_check_for_changes_in_testcases.py --xml_report $XML_REPORT_BRANCH $CSV_BRANCH $CSV_MAIN || regressions_found=$?



    - if [ $exit_code -eq 1 ]; then echo "Differences encountered"; exit_code=$EXIT_CODE_NON_BE; fi

    - if [ $zero_errors_branch != 1 ]; then echo "Run errors encountered!"; exit_code=$EXIT_CODE_NON_BE; fi
@@ -552,10 +560,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:
@@ -1286,6 +1301,18 @@ ivas-pytest-renderer: 
    - LEVEL_SCALING=1.0

  <<: *ivas-pytest-anchor



peaq-enc-passthrough:

  extends:

    - .test-job-linux

  rules:

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

  before_script:

    - USE_LTV=0

    - DUT_DECODER_PATH=./$REF_DECODER_PATH

    - TEST_SUITE="tests/test_enc_passthrough.py"

    - DELTA_ODG="true"

    - LEVEL_SCALING=1.0

  <<: *ivas-pytest-anchor



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

# Various other tests

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/cnst.h

+1 −0
Original line number Diff line number Diff line
@@ -1536,6 +1536,7 @@ enum 
#define SHB_OVERLAP_LEN                     ( L_FRAME16k - L_SHB_LAHEAD ) / ( NUM_SHB_SUBFR - 1 )

#define QUANT_DIST_INIT                     ( 10000000000.0f )      /* Quantiser search distance initialisation */

#define HIBND_ACB_L_FAC                     5 / 2                   /* SHB Interpolation Factor */

#define HIBND_ACB_L_FAC_Q1                  ( 5 )                   /* SHB Interpolation Factor Q1 */

#define NUM_HILBERTS                        2

#define HILBERT_ORDER1                      5

#define HILBERT_ORDER2                      4

lib_com/ivas_dirac_com.c

+8 −8
Original line number Diff line number Diff line
@@ -976,13 +976,13 @@ void computeDiffuseness_fixed( 
        if ( shift_q < 0 )

        {

            shiftEquiv = L_lshl( 0x80000000, shift_q );

            shift_qtotal = sub( min_q_shift1, 0 );

        }

        if ( shift_q >= 0 )

        {

            shiftEquiv = L_add( 0x7FFFFFFF, 0 );

            shift_qtotal = sub( min_q_shift1, shift_q );

        }

        shift_qtotal = sub( min_q_shift1, s_max( shift_q, 0 ) );



        FOR( k = 0; k < num_freq_bands; k++ )

        {

            tmp = L_shl( p_tmp_c[k], shift_qtotal );
@@ -1019,16 +1019,16 @@ void computeDiffuseness_fixed( 


        shift_q = sub( q_tmp, q_intensity );

#ifdef FIX_1072_SPEEDUP_COMPUTEDIFUSENESS

        if ( shift_q >= 0 )

        {

            shiftEquiv = L_lshl( 0x7FFFFFFF, 0 );

            shift_qtotal = sub( min_q_shift2, shift_q );

        }

        if ( shift_q < 0 )

        {

            shiftEquiv = L_lshl( 0x80000000, shift_q );

            shift_qtotal = sub( min_q_shift2, 0 );

        }

        if ( shift_q >= 0 )

        {

            shiftEquiv = L_lshl( 0x7FFFFFFF, 0 );

        }

        shift_qtotal = sub( min_q_shift2, s_max( shift_q, 0 ) );



        FOR( j = 0; j < DIRAC_NUM_DIMS; ++j )

        {

            p_tmp = buffer_intensity[j][i];

lib_com/options.h

+7 −3
Original line number Diff line number Diff line
@@ -156,6 +156,7 @@ 
#define FIX_ISSUE_1214                          /* Ittiam: Fix for issue 1214: Energy leakage in IGF tiles for MDCT-stereo @64kbps SWB*/

#define FIX_881_HILBERT_FILTER                  /* VA: improve the precision of the Hilbert filter to remove 2kHz unwanted tone */

#define FIX_ISSUE_1245                          /* Ittiam: Fix for issue 1245: Basop Encoder: Audible noise for silent Stereo input DTX on @24.4 kbps, @32 kbps*/

#define FIX_ISSUE_1291                          /* Ittiam: Wrong use of imult1616() in ACELP rescaling */

#define FIX_920_IGF_INIT_ERROR                  /* FhG: issue 920: fix bitrate mismatch in initial IGF config to avoid error message in same cases */

#define FIX_MINOR_SVD_WMOPS_MR1010X             /* FhG: Minor WMOPS tuning, bit-exact to previous version, saves about 8.2 WMOPS for MR1010 */

#define SVD_WMOPS_OPT                           /* Ittiam : SVD related optimizations */
@@ -164,9 +165,12 @@ 
#define FIX_ISSUE_1247

#define NONBE_FIX_1087_OOB_SBA_DTX_RS                   /* VA: issue 1087: Extend the length of the buffer for MCT decoding to avoid out-of-bound writing in SBA SID bitrate switching decoding */

#define FIX_1285_DECODER_CRASH

#define FIX_1072_SPEEDUP_gainpanning            /* FhG: Minor WMOPS tuning, in development*/

#define FIX_1072_SPEEDUP_COMPUTEDIFUSENESS      /* "-" */



#define FIX_1072_SPEEDUP_gainpanning            /* FhG: Minor WMOPS tuning, nonbe */

#define FIX_1072_SPEEDUP_COMPUTEDIFUSENESS      /* FhG: Minor WMOPS tuning, nonbe */

#define FIX_1320_LOWRATE_ACELP

#define FIX_1297_OVERFLOW                       /* VA: fixes issue with overflows in pre-processing */

#define FIX_1298                                /* VA: fix possible assert in gaus_enc */

#define FIX_1300_ICA_SHIFT_QUANT_IMPROV         /* VA: Fix to 1300 to improve precision of the lag quantizer */



#define FIX_1072_SPEEDUP_ivas_dirac_dec_get_response_fx /*FhG: WMOPS tuning, in development*/

#define FIX1072_SPEEDUP_ivas_dirac_dec_output_synthesis_process_slot /*FhG: WMOPS tuning, in development*/