Merge branch 'ci/port-framesize-be-test' into 'main' (c7a85855) · Commits · SA4 / Audio / IVAS BASOP

.gitlab-ci.yml

+61 −1

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 41186736915f5c0a857ac92e8ab438c434e5247d
		IVAS_CODEC_CI_REF: &IVAS_CODEC_CI_REF a31272de16bd1b556269a50bc179321a60f2a500

		include:
		- local: .gitlab-ci/variables.yml
		@@ -62,6 +62,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 == 'renderer-framesize-be'
		variables:
		IVAS_PIPELINE_NAME: 'Renderer framesize 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'
		@@ -1060,6 +1063,63 @@ check-regressions-short-dec--10db:
		DUT_ENCODER_PATH: "$REF_ENCODER_PATH"
		MERGE_TARGET_ENCODER_PATH: "$REF_ENCODER_PATH"

		check-be-between-renderer-framesizes:
		extends:
		- .test-job-linux
		# - .rules-pytest-to-main-short
		rules:
		- if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == "renderer-framesize-be"
		stage: test
		needs: ["build-codec-linux-make"]
		script:
		- bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/disable-limiter.sh
		- make clean
		- make -j
		- echo "$SHORT_TEST_SUITE"

		- bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/build-float-ref-and-dut-binaries.sh
		- python3 ci/remove_unsupported_testcases.py $PRM_FILES

		- exit_code=0
		- python3 -m pytest tests/codec_be_on_mr_nonselection --tb=no -v --ref_encoder_path ./IVAS_cod_ref --ref_decoder_path ./IVAS_dec --update_ref 1 --html=report-20ms.html --self-contained-html --junit-xml=report-junit-20ms.xml \|\| exit_code=$?

		- exit_code5=0
		- exit_code10=0
		- python3 -m pytest tests/codec_be_on_mr_nonselection --tb=no -v --ref_encoder_path ./IVAS_cod_ref --ref_decoder_path ./IVAS_dec --html=report-5ms.html --self-contained-html --junit-xml=report-junit-5ms.xml --dut_fr 5 --decoder_only \|\| exit_code5=$?
		- python3 -m pytest tests/codec_be_on_mr_nonselection --tb=no -v --ref_encoder_path ./IVAS_cod_ref --ref_decoder_path ./IVAS_dec --html=report-10ms.html --self-contained-html --junit-xml=report-junit-10ms.xml --dut_fr 10 --decoder_only \|\| exit_code10=$?

		- zero_errors5=$(cat report-junit-5ms.xml \| grep -c 'errors="0"') \|\| true
		- zero_errors10=$(cat report-junit-10ms.xml \| grep -c 'errors="0"') \|\| true
		- zero_errors=1

		- *print-results-banner
		- echo "!! Encoder command lines are in the 20ms log files only !!!"
		- if [ $exit_code -ne 0 ]; then echo "20 ms framesize run already failed with errors."; zero_errors=0; fi
		- if [ $zero_errors5 != 1 ]; then echo "run error with 5ms rendering encountered"; zero_errors=0 ; fi
		- if [ $zero_errors10 != 1 ]; then echo "run error with 10ms rendering encountered"; zero_errors=0 ; fi
		- if [ $zero_errors != 1 ]; then exit $EXIT_CODE_FAIL; fi
		- if [ $exit_code5 -ne 0 ]; then echo "Non-bitexact cases encountered with 5ms rendering!"; exit_code=1; fi
		- if [ $exit_code10 -ne 0 ]; then echo "Non-bitexact cases encountered with 10ms rendering!"; exit_code=1; fi
		- if [ $exit_code -ne 0 ]; then exit $EXIT_CODE_FAIL; fi
		artifacts:
		name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--stage-$CI_JOB_STAGE--results"
		expire_in: 1 week
		when: always
		expose_as: "pytest 5ms and 10ms vs 20ms results"
		paths:
		- report-junit-5ms.xml
		- report-5ms.html
		- report-junit-10ms.xml
		- report-10ms.html
		- report-junit-20ms.xml
		- report-20ms.html
		reports:
		junit:
		- report-junit-5ms.xml
		- report-junit-10ms.xml
		- report-junit-20ms.xml


		# ---------------------------------------------------------------
		# Short test jobs for running from web interface or schedule
		# ---------------------------------------------------------------

.gitlab-ci/variables.yml

+1 −0

Original line number	Diff line number	Diff line
		@@ -63,4 +63,5 @@ variables:
		- 'complexity'
		- 'coverage'
		- 'voip-be-test'
		- 'renderer-framesize-be'
		- 'peaq-enc-passthrough'

lib_com/options.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -63,6 +63,8 @@
		/define MEM_COUNT_DETAILS/ /* Output detailed memory analysis for the worst-case frame (writes to the file "mem_analysis.csv") */
		#endif

		/#define DISABLE_LIMITER/

		/* #################### End DEBUGGING switches ############################ */

		#ifndef BASOP_NOGLOB_DEV_USE_GLOBALS

lib_rend/lib_rend_fx.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -350,6 +350,7 @@ static void accumulate2dArrayToBuffer_fx(
		* In-place saturation control for multichannel buffers with adaptive release time
		-------------------------------------------------------------------/

		#ifndef DISABLE_LIMITER
		/! r: number of clipped output samples /
		static Word32 limitRendererOutput_fx(
		IVAS_LIMITER_HANDLE hLimiter, /* i/o: limiter struct handle */
		@@ -393,6 +394,7 @@ static Word32 limitRendererOutput_fx(

		return numClipping;
		}
		#endif

		/-------------------------------------------------------------------
		* validateOutputAudioConfig()
		@@ -7325,7 +7327,9 @@ static ivas_error getSamplesInternal(
		test();

		Word32 limiter_thresold = L_lshl( IVAS_LIMITER_THRESHOLD, *outAudio.pq_fact );
		#ifndef DISABLE_LIMITER
		limitRendererOutput_fx( hIvasRend->hLimiter, outAudio.data_fx, outAudio.config.numSamplesPerChannel, limiter_thresold, *outAudio.pq_fact );
		#endif

		/* update global cominbed orientation start index */
		ivas_combined_orientation_update_start_index( hIvasRend->hCombinedOrientationData, outAudio.config.numSamplesPerChannel );