Merge remote-tracking branch 'origin' into 3gpp_issue_1348_fix (da4db864) · Commits · SA4 / Audio / IVAS BASOP

.gitlab-ci.yml

+15 −7

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 f5e61349c22ededcdfe1cc54e533dea477f2d003
		IVAS_CODEC_CI_REF: &IVAS_CODEC_CI_REF 44cb5638949b874ce0f5c3bf4359f9db860d88bc

		include:
		- local: .gitlab-ci/variables.yml
		- local: .gitlab-ci/rules-basis.yml
		- project: ivas-codec-pc/ivas-codec-ci
		ref: *IVAS_CODEC_CI_REF
		file: main.yml
		@@ -638,8 +639,6 @@ workflow:
		- report-junit.xml

		.ivas-pytest-compare-to-input-anchor: &ivas-pytest-compare-to-input-anchor
		extends:
		- .job-linux
		stage: test
		needs: ["build-codec-linux-make"]
		timeout: "360 minutes"
		@@ -1272,6 +1271,9 @@ ivas-pytest-compare_ref-long-dec:
		extends:
		- .rules-pytest-long
		- .test-job-linux
		tags:
		- ivas-basop-linux
		- high-memory-capacity
		before_script:
		- USE_LTV=1
		- DUT_ENCODER_PATH=./$REF_ENCODER_PATH
		@@ -1296,6 +1298,9 @@ ivas-pytest-compare_ref-long-dec-lev-10:
		extends:
		- .rules-pytest-long
		- .test-job-linux
		tags:
		- ivas-basop-linux
		- high-memory-capacity
		before_script:
		- USE_LTV=1
		- DUT_ENCODER_PATH=./$REF_ENCODER_PATH
		@@ -1320,6 +1325,9 @@ ivas-pytest-compare_ref-long-dec-lev+10:
		extends:
		- .rules-pytest-long
		- .test-job-linux
		tags:
		- ivas-basop-linux
		- high-memory-capacity
		before_script:
		- USE_LTV=1
		- DUT_ENCODER_PATH=./$REF_ENCODER_PATH

.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'

lib_com/basop_util.c

+0 −10

Original line number	Diff line number	Diff line
		@@ -1409,15 +1409,6 @@ Word32 BASOP_Util_Divide3232_Scale_newton( Word32 x, Word32 y, Word16 *s )
		*s = 0;
		return ( (Word32) 0 );
		}

		#if 0
		sign = L_xor( x, y ); /* check (sign < 0) for result negation */

		if ( x < 0 )
		{
		x = L_negate( x );
		}
		#else
		IF( EQ_32( y, 0x80000000 ) )
		{
		/* Division by -1.0: same as negation of numerator */
		@@ -1429,7 +1420,6 @@ Word32 BASOP_Util_Divide3232_Scale_newton( Word32 x, Word32 y, Word16 *s )
		}
		sign = y;
		move32();
		#endif
		if ( y < 0 )
		{
		y = L_negate( y );

lib_com/bitstream_fx.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -52,7 +52,6 @@

		int16_t FEC_seed = 12558; /* Seed for random FEC generator */
		FILE FEC_pattern = NULL; / FEC pattern file (for simulation of FEC) */
		#ifndef IVAS_CODE
		float FEC_random = 0; /* FEC rate in percent (for simulation of FEC) */
		/-------------------------------------------------------------------
		* file_read_FECpattern()
		@@ -109,7 +108,6 @@ static int16_t file_read_FECpattern( void )
		return bfi;
		}
		#endif
		#endif
		/-------------------------------------------------------------------
		* pack_bit()
		*

lib_com/cldfb_evs.c

+0 −7

Original line number	Diff line number	Diff line
		@@ -981,10 +981,6 @@ ivas_error openCldfb(
		const Word16 type, /!< analysis or synthesis /
		const Word16 maxCldfbBands, /!< number of cldfb bands /
		const Word16 frameSize /!< FrameSize /
		#ifdef ADD_IVAS_CLDFB
		,
		CLDFB_PROTOTYPE prototype /* i : CLDFB version (1.25ms/5ms delay) */
		#endif
		)
		{
		HANDLE_CLDFB_FILTER_BANK hs;
		@@ -996,9 +992,6 @@ ivas_error openCldfb(
		}

		hs->type = type;
		#ifdef ADD_IVAS_CLDFB
		hs->prototype = prototype;
		#endif
		move16();

		IF( type == CLDFB_ANALYSIS )