Commit c9e2364c authored by Sandesh Venkatesh's avatar Sandesh Venkatesh
Browse files

Merge branch 'main' into 1072-complexity-high-complexity-overhead-for-osba-decoding

parents 74d1e195 9ae2ae46

.gitlab-ci.yml

+11 −4
Original line number Diff line number Diff line
@@ -491,7 +491,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 +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/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_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_com/options.h

+2 −0
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 */
@@ -166,4 +167,5 @@ 
#define FIX_1285_DECODER_CRASH

#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

#endif