- Merge remote-tracking branch 'remotes/origin/main' into Remove_evs_duplicates_clean (dfab6762) · Commits · SA4 / Audio / IVAS BASOP

.gitattributes

0 → 100644

+24 −0

Original line number	Diff line number	Diff line
		# Default behavior. Converts all text files to use LF in repository.
		* text=auto

		# List all known generic text files
		*.c text
		*.csv text
		*.h text
		*.json text
		*.m text
		*.md text
		*.prm text
		*.py text
		*.txt text

		# Set Windows specific text files to always use CRLF in working tree.
		*.bat text eol=crlf
		*.cmd text eol=crlf
		*.sln text eol=crlf
		*.vcxproj text eol=crlf
		*.vcxproj.filters text eol=crlf

		# Set Unix specific text files to always use LF (also covers Windows subsystem for Linux) in working tree
		*.sh text eol=lf

.gitlab-ci.yml

+300 −416

File changed.

Preview size limit exceeded, changes collapsed.

.gitlab-ci/rules-basis.yml

0 → 100644

+53 −0

Original line number	Diff line number	Diff line
		# overwrites the default rules in the IVAS CI repository
		# should be refactored and unified
		.rules-basis:
		rules:
		# see https://docs.gitlab.com/ee/ci/yaml/workflow.html#switch-between-branch-pipelines-and-merge-request-pipelines
		- if: $CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS && $CI_PIPELINE_SOURCE == "push"
		when: never
		- if: $CI_PIPELINE_SOURCE == 'merge_request_event'
		variables:
		IVAS_PIPELINE_NAME: 'MR pipeline: $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME'
		### disabled for now because pipeline cd is redundant with MR pipeline with current workflow
		# - if: $CI_PIPELINE_SOURCE == 'push' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH # Pushes to main
		# variables:
		# IVAS_PIPELINE_NAME: 'Push pipeline: $CI_COMMIT_BRANCH'
		- if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'default' # for testing
		variables:
		IVAS_PIPELINE_NAME: 'Web run pipeline: $CI_COMMIT_BRANCH'
		- if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'pytest-compare'
		variables:
		IVAS_PIPELINE_NAME: 'Run comparison tools against float ref: $CI_COMMIT_BRANCH'
		- if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'pytest-compare-enc-dmx'
		variables:
		IVAS_PIPELINE_NAME: 'Run encoder dmx comparison against float ref: $CI_COMMIT_BRANCH'
		- if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'pytest-compare-long'
		variables:
		IVAS_PIPELINE_NAME: 'Run comparison tools against float ref (long test vectors): $CI_COMMIT_BRANCH'
		- if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'pytest-compare-to-input'
		variables:
		IVAS_PIPELINE_NAME: 'Run comparison tools against input (pass-through only): $CI_COMMIT_BRANCH'
		- if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'pytest-saturation-smoke-test'
		variables:
		IVAS_PIPELINE_NAME: 'Run saturation smoke-test: $CI_COMMIT_BRANCH'
		- 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'
		variables:
		IVAS_PIPELINE_NAME: 'Short testvectors sanitizers'
		- if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'pytest-renderer'
		variables:
		IVAS_PIPELINE_NAME: 'Renderer test: $CI_COMMIT_BRANCH'
		- if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'complexity'
		variables:
		IVAS_PIPELINE_NAME: 'Complexity Measurement on $CI_COMMIT_BRANCH'
		- 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'

.gitlab-ci/variables.yml

0 → 100644

+65 −0

Original line number	Diff line number	Diff line
		variables:
		EVS_BE_TEST_DIR_BASOP: "/usr/local/be_2_evs_basop"
		FLOAT_REF_BRANCH: "ivas-float-update"
		SCRIPTS_DIR: "/usr/local/scripts"
		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"
		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: ""
		# These path variables are used by the pytest calls.
		# They can be overwritten in the job templates to e.g. only test encoder or decoder in the chain
		DUT_ENCODER_PATH: "./IVAS_cod"
		DUT_DECODER_PATH: "./IVAS_dec"
		REF_ENCODER_PATH: "./IVAS_cod_ref"
		REF_DECODER_PATH: "./IVAS_dec_ref"
		MERGE_TARGET_ENCODER_PATH: "./IVAS_cod_merge_target"
		MERGE_TARGET_DECODER_PATH: "./IVAS_dec_merge_target"
		# These path variables are used for building the binaries
		# They should never be overwritten!
		REF_ENCODER_PATH_FOR_BUILD_DO_NOT_MODIFY: "./IVAS_cod_ref"
		REF_DECODER_PATH_FOR_BUILD_DO_NOT_MODIFY: "./IVAS_dec_ref"
		MERGE_TARGET_ENCODER_PATH_FOR_BUILD_DO_NOT_MODIFY: "./IVAS_cod_merge_target"
		MERGE_TARGET_DECODER_PATH_FOR_BUILD_DO_NOT_MODIFY: "./IVAS_dec_merge_target"
		LEVEL_SCALING: "1.0"
		BASOP_CI_BRANCH_PC_REPO: "basop-ci-branch"
		PRM_FILES: "scripts/config/self_test.prm scripts/config/self_test_ltv.prm"
		TESTCASE_TIMEOUT_STV: 900
		TESTCASE_TIMEOUT_LTV: 2400
		TESTCASE_TIMEOUT_LTV_SANITIZERS: 10800
		CI_REGRESSION_THRESH_MLD: "0.1"
		CI_REGRESSION_THRESH_MAX_ABS_DIFF: "50"
		CI_REGRESSION_THRESH_SSNR: "-1"
		CI_REGRESSION_THRESH_ODG: "-0.05"
		INSTR_DIR: "scripts/c-code_instrument"
		BUILD_WITH_DEBUG_MODE_INFO: ""
		ENCODER_TEST: ""
		DELTA_ODG: ""
		COMPARE_DMX: ""
		SPLIT_COMPARISON: ""
		SKIP_REGRESSION_CHECK: ""
		FAILED_TESTCASES_LIST: "failed-testcases.txt"
		ERRORS_TESTCASES_LIST: "errors-testcases.txt"
		PYTEST_CACHE_ARTIFACT: "pytest_cache.zip"
		MEASURES_FOR_REPORT: "MLD MAX_ABS_DIFF MIN_SSNR MIN_ODG"
		FLOAT_REF_COMMIT_FILE: "float-ref-git-sha.txt"
		CUT_COMMIT_FILE: "CuT-git-sha.txt"
		MERGE_TARGET_COMMIT_FILE: "merge-target-git-sha.txt"
		MANUAL_PIPELINE_TYPE:
		description: "Type for the manual pipeline run. Use 'pytest-compare' to run comparison test against reference float codec."
		value: 'default'
		options:
		- 'default'
		- 'pytest-compare'
		- 'pytest-compare-enc-dmx'
		- 'pytest-compare-long'
		- 'pytest-compare-to-input'
		- 'pytest-saturation-smoke-test'
		- 'evs-26444'
		- 'sanitizer'
		- 'pytest-renderer'
		- 'complexity'
		- 'coverage'
		- 'voip-be-test'
		- 'peaq-enc-passthrough'

lib_com/basop32.c

+7 −1

Original line number	Diff line number	Diff line
		@@ -1575,7 +1575,7 @@ Word32 L_msuNs_co( Word32 L_var3, Word16 var1, Word16 var2, Flag Carry, Flag O
		{
		Word32 L_var_out;

		L_var_out = L_mult( var1, var2 );
		L_var_out = L_mult_o( var1, var2, Overflow );
		L_var_out = L_sub_co( L_var3, L_var_out, Carry, Overflow );

		return ( L_var_out );
		@@ -2038,6 +2038,7 @@ Word32 DEPR_L_sub_c( Word32 L_var1, Word32 L_var2, Flag *Carry )

		return ( L_var_out );
		}

		Word32 L_sub_co( Word32 L_var1, Word32 L_var2, Flag Carry, Flag Overflow )
		{
		Word32 L_var_out;
		@@ -2056,6 +2057,7 @@ Word32 L_sub_co( Word32 L_var1, Word32 L_var2, Flag Carry, Flag Overflow )
		L_var_out = L_var1 - L_var2;
		if ( L_var1 > 0L )
		{
		set_overflow( Overflow );
		unset_carry( Carry );
		}
		}
		@@ -2067,18 +2069,22 @@ Word32 L_sub_co( Word32 L_var1, Word32 L_var2, Flag Carry, Flag Overflow )

		if ( ( L_test < 0 ) && ( L_var1 > 0 ) && ( L_var2 < 0 ) )
		{
		set_overflow( Overflow );
		carry_int = 0;
		}
		else if ( ( L_test > 0 ) && ( L_var1 < 0 ) && ( L_var2 > 0 ) )
		{
		set_overflow( Overflow );
		carry_int = 1;
		}
		else if ( ( L_test > 0 ) && ( ( L_var1 ^ L_var2 ) > 0 ) )
		{
		unset_overflow( Overflow );
		carry_int = 1;
		}
		if ( L_test == MIN_32 )
		{
		set_overflow( Overflow );
		carry_int ? set_carry( Carry ) : unset_carry( Carry );
		}
		else