Merge remote-tracking branch 'origin/main' into... (82157584) · Commits · SA4 / Audio / IVAS BASOP

.gitlab-ci.yml

+26 −19

Original line number	Diff line number	Diff line
		@@ -10,7 +10,8 @@ variables:
		LONG_TEST_SUITE: "tests/codec_be_on_mr_nonselection tests/renderer --param_file scripts/config/self_test_ltv.prm --use_ltv"
		LONG_TEST_SUITE_NO_RENDERER: "tests/codec_be_on_mr_nonselection --param_file scripts/config/self_test_ltv.prm --use_ltv"
		SHORT_TEST_SUITE: "tests/codec_be_on_mr_nonselection"
		ENCODER_TEST_SUITE: "tests/codec_be_on_mr_nonselection/test_param_file.py --param_file scripts/config/self_test_basop_encoder.prm"
		SHORT_TEST_SUITE_ENCODER: "tests/codec_be_on_mr_nonselection/test_param_file.py --param_file scripts/config/self_test_basop_encoder.prm"
		LONG_TEST_SUITE_ENCODER: "tests/codec_be_on_mr_nonselection/test_param_file.py --param_file scripts/config/self_test_ltv_basop_encoder.prm"
		TEST_SUITE: ""
		DUT_ENCODER_PATH: "./IVAS_cod"
		DUT_DECODER_PATH: "./IVAS_dec"
		@@ -41,7 +42,7 @@ variables:
		- 'pytest-compare-to-input'
		- 'pytest-saturation-smoke-test'
		- 'evs-26444'
		- 'sanitizer-stv'
		- 'sanitizer'
		- 'pytest-renderer'
		- 'complexity'
		- 'coverage'
		@@ -82,7 +83,7 @@ workflow:
		- if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'evs-26444'
		variables:
		IVAS_PIPELINE_NAME: 'EVS 26.444 test: $CI_COMMIT_BRANCH'
		- if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'sanitizer-stv'
		- if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'sanitizer'
		variables:
		IVAS_PIPELINE_NAME: 'Short testvectors sanitizers'
		- if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'pytest-renderer'
		@@ -493,14 +494,14 @@ stages:
		.ivas-pytest-sanitizers-anchor: &ivas-pytest-sanitizers-anchor
		stage: test
		needs: ["build-codec-linux-make"]
		timeout: "90 minutes"
		timeout: "300 minutes"
		rules:
		- if: $CI_PIPELINE_SOURCE == 'push'
		when: never
		- if: $CI_PIPELINE_SOURCE == 'merge_request_event'
		when: never
		- if: $CI_PIPELINE_SOURCE == 'schedule' && $IVAS_PYTEST_MSAN
		- if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == "sanitizer-stv"
		- if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == "sanitizer"
		script:
		- *print-common-info
		- *update-scripts-repo
		@@ -510,7 +511,7 @@ stages:
		- make -j CLANG=$CLANG_NUM
		- if [[ $CLANG_NUM == 3 ]]; then export UBSAN_OPTIONS="suppressions=scripts/ubsan.supp,report_error_type=1"; fi
		- testcase_timeout=$TESTCASE_TIMEOUT_STV_SANITIZERS
		- python3 -m pytest $SHORT_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
		- 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:
		name: "$CI_JOB_NAME--sha-$CI_COMMIT_SHORT_SHA--results"
		when: always
		@@ -733,7 +734,7 @@ build-codec-linux-debugging-make:
		# before_script:
		# - USE_LTV=0
		# - DUT_DECODER_PATH=./IVAS_dec_ref
		# - TEST_SUITE="$SHORT_TEST_SUITE"
		# - TEST_SUITE="$SHORT_TEST_SUITE_ENCODER"
		# - LEVEL_SCALING=1.0
		# <<: *ivas-pytest-on-merge-request-anchor

		@@ -744,7 +745,7 @@ build-codec-linux-debugging-make:
		# before_script:
		# - USE_LTV=0
		# - DUT_DECODER_PATH=./IVAS_dec_ref
		# - TEST_SUITE="$SHORT_TEST_SUITE"
		# - TEST_SUITE="$SHORT_TEST_SUITE_ENCODER"
		# - LEVEL_SCALING=0.3162
		# <<: *ivas-pytest-on-merge-request-anchor

		@@ -755,7 +756,7 @@ build-codec-linux-debugging-make:
		# before_script:
		# - USE_LTV=0
		# - DUT_DECODER_PATH=./IVAS_dec_ref
		# - TEST_SUITE="$SHORT_TEST_SUITE"
		# - TEST_SUITE="$SHORT_TEST_SUITE_ENCODER"
		# - LEVEL_SCALING=3.162
		# <<: *ivas-pytest-on-merge-request-anchor

		@@ -810,7 +811,7 @@ ivas-pytest-compare_to_ref-short-enc:
		- USE_LTV=0
		- ENCODER_TEST="true"
		- DUT_DECODER_PATH=./$REF_DECODER_PATH
		- TEST_SUITE="$ENCODER_TEST_SUITE"
		- TEST_SUITE="$SHORT_TEST_SUITE_ENCODER"
		- LEVEL_SCALING=1.0
		<<: *ivas-pytest-anchor

		@@ -823,7 +824,7 @@ ivas-pytest-compare_to_ref-short-enc-lev-10:
		- USE_LTV=0
		- ENCODER_TEST="true"
		- DUT_DECODER_PATH=./$REF_DECODER_PATH
		- TEST_SUITE="$ENCODER_TEST_SUITE"
		- TEST_SUITE="$SHORT_TEST_SUITE_ENCODER"
		- LEVEL_SCALING=0.3162
		<<: *ivas-pytest-anchor

		@@ -836,7 +837,7 @@ ivas-pytest-compare_to_ref-short-enc-lev+10:
		- USE_LTV=0
		- ENCODER_TEST="true"
		- DUT_DECODER_PATH=./$REF_DECODER_PATH
		- TEST_SUITE="$ENCODER_TEST_SUITE"
		- TEST_SUITE="$SHORT_TEST_SUITE_ENCODER"
		- LEVEL_SCALING=3.162
		<<: *ivas-pytest-anchor

		@@ -846,6 +847,7 @@ ivas-pytest-enc-msan:
		before_script:
		- CLANG_NUM=1
		- DUT_DECODER_PATH=./$REF_DECODER_PATH
		- TEST_SUITE=$LONG_TEST_SUITE_ENCODER
		<<: *ivas-pytest-sanitizers-anchor

		ivas-pytest-enc-asan:
		@@ -854,6 +856,7 @@ ivas-pytest-enc-asan:
		before_script:
		- CLANG_NUM=2
		- DUT_DECODER_PATH=./$REF_DECODER_PATH
		- TEST_SUITE=$LONG_TEST_SUITE_ENCODER
		<<: *ivas-pytest-sanitizers-anchor

		ivas-pytest-enc-usan:
		@@ -862,6 +865,7 @@ ivas-pytest-enc-usan:
		before_script:
		- CLANG_NUM=3
		- DUT_DECODER_PATH=./$REF_DECODER_PATH
		- TEST_SUITE=$SHORT_TEST_SUITE_ENCODER
		<<: *ivas-pytest-sanitizers-anchor

		### jobs that test flt encoder -> fx decoder
		@@ -917,32 +921,35 @@ ivas-pytest-compare-to-input-short-enc:
		before_script:
		- USE_LTV=0
		- DUT_DECODER_PATH=./$REF_DECODER_PATH
		- TEST_SUITE="$SHORT_TEST_SUITE"
		- TEST_SUITE="$SHORT_TEST_SUITE_ENCODER"
		- LEVEL_SCALING=1.0
		<<: *ivas-pytest-compare-to-input-anchor

		ivas-pytest-dec-msan-short:
		ivas-pytest-dec-msan:
		extends:
		- .test-job-linux
		before_script:
		- CLANG_NUM=1
		- DUT_ENCODER_PATH=./$REF_ENCODER_PATH
		- TEST_SUITE=$LONG_TEST_SUITE_SELF_TEST
		<<: *ivas-pytest-sanitizers-anchor

		ivas-pytest-dec-asan-short:
		ivas-pytest-dec-asan:
		extends:
		- .test-job-linux
		before_script:
		- CLANG_NUM=2
		- DUT_ENCODER_PATH=./$REF_ENCODER_PATH
		- TEST_SUITE=$LONG_TEST_SUITE_SELF_TEST
		<<: *ivas-pytest-sanitizers-anchor

		ivas-pytest-dec-usan-short:
		ivas-pytest-dec-usan:
		extends:
		- .test-job-linux
		before_script:
		- CLANG_NUM=3
		- DUT_ENCODER_PATH=./$REF_ENCODER_PATH
		- TEST_SUITE=$SHORT_TEST_SUITE
		<<: *ivas-pytest-sanitizers-anchor

		# ---------------------------------------------------------------
		@@ -956,7 +963,7 @@ ivas-pytest-compare_ref-long-enc:
		before_script:
		- USE_LTV=1
		- DUT_DECODER_PATH=./$REF_DECODER_PATH
		- TEST_SUITE="$LONG_TEST_SUITE"
		- TEST_SUITE="$LONG_TEST_SUITE_ENCODER"
		- LEVEL_SCALING=1.0
		<<: *ivas-pytest-anchor

		@@ -978,7 +985,7 @@ ivas-pytest-compare_ref-long-enc-lev-10:
		before_script:
		- USE_LTV=1
		- DUT_DECODER_PATH=./$REF_DECODER_PATH
		- TEST_SUITE="$LONG_TEST_SUITE"
		- TEST_SUITE="$LONG_TEST_SUITE_ENCODER"
		- LEVEL_SCALING=0.3162
		<<: *ivas-pytest-anchor

		@@ -1000,7 +1007,7 @@ ivas-pytest-compare_ref-long-enc-lev+10:
		before_script:
		- USE_LTV=1
		- DUT_DECODER_PATH=./$REF_DECODER_PATH
		- TEST_SUITE="$LONG_TEST_SUITE"
		- TEST_SUITE="$LONG_TEST_SUITE_ENCODER"
		- LEVEL_SCALING=3.162
		<<: *ivas-pytest-anchor

Workspace_msvc/lib_com.vcxproj

+0 −2

Original line number	Diff line number	Diff line
		@@ -142,9 +142,7 @@
		<ClCompile Include="..\lib_com\cng_exc_fx.c" />
		<ClCompile Include="..\lib_com\codec_tcx_common.c" />
		<ClCompile Include="..\lib_com\complex_basop.c" />
		<ClCompile Include="..\lib_com\control.c" />
		<ClCompile Include="..\lib_com\core_com_config.c" />
		<ClCompile Include="..\lib_com\count.c" />
		<ClCompile Include="..\lib_com\deemph.c" />
		<ClCompile Include="..\lib_com\delay_comp.c" />
		<ClCompile Include="..\lib_com\disclaimer.c" />

Workspace_msvc/lib_com.vcxproj.filters

+0 −4

Original line number	Diff line number	Diff line
		@@ -76,9 +76,6 @@
		<ClCompile Include="..\lib_com\ivas_lfe_com.c">
		<Filter>common_ivas_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_com\control.c">
		<Filter>common_all_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_com\enh64.c">
		<Filter>common_all_c</Filter>
		</ClCompile>
		@@ -417,7 +414,6 @@
		<ClCompile Include="..\lib_com\tools.c" />
		<ClCompile Include="..\lib_com\wtda.c" />
		<ClCompile Include="..\lib_com\gs_bitallocation_ivas_fx.c" />
		<ClCompile Include="..\lib_com\count.c" />
		<ClCompile Include="..\lib_com\ivas_stereo_ica_com_fx.c" />
		<ClCompile Include="..\lib_com\frame_ener_fx.c" />
		<ClCompile Include="..\lib_com\get_gain_fx.c" />

lib_com/basop32.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -159,7 +159,9 @@ HISTORY:

		#include <stdio.h>
		#include <stdlib.h>
		#include "options.h"
		#include "stl.h"

		#ifdef BASOP_NOGLOB
		#include <assert.h>
		#endif /* BASOP_NOGLOB */
		@@ -170,10 +172,6 @@ HISTORY:
		#pragma warning( disable : 4310 )
		#endif

		#ifdef WMOPS
		extern BASIC_OP multiCounter[MAXCOUNTERS];
		extern int currCounter;
		#endif

		/*___________________________________________________________________________
		\| \|

lib_com/basop_util.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -43,7 +43,6 @@
		#include "rom_com.h"
		#include "rom_basic_math.h"
		#include "basop_settings.h"
		#include "control.h"
		#include "cnst.h"


		@@ -1556,7 +1555,7 @@ Word16 findIndexOfMinWord32( Word32 *x, const Word16 len )
		Word16 imult1616( Word16 x, Word16 y )
		{
		assert( (int) x * (int) y < 32768 && (int) x * (int) y >= -32768 );
		return extract_l( L_mult0( x, y ) );
		return i_mult( x, y );
		}

		Word32 imult3216( Word32 x, Word16 y )