Merge with main (c3e516fb) · Commits · SA4 / Audio / IVAS BASOP

.gitlab-ci.yml

+51 −2

Original line number	Diff line number	Diff line
		@@ -23,7 +23,7 @@ variables:
		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: 6000
		TESTCASE_TIMEOUT_LTV_SANITIZERS: 7200
		CI_REGRESSION_THRESH_MLD: "0.1"
		CI_REGRESSION_THRESH_MAX_ABS_DIFF: "50"
		CI_REGRESSION_THRESH_SSNR: "-1"
		@@ -33,6 +33,7 @@ variables:
		BUILD_WITH_DEBUG_MODE_INFO: ""
		ENCODER_TEST: ""
		DELTA_ODG: ""
		SKIP_REGRESSION_CHECK: ""
		MANUAL_PIPELINE_TYPE:
		description: "Type for the manual pipeline run. Use 'pytest-compare' to run comparison test against reference float codec."
		value: 'default'
		@@ -126,6 +127,13 @@ stages:
		echo "Commit time was $CI_COMMIT_TIMESTAMP"
		date \| xargs echo "System time is"

		.print-common-info-windows: &print-common-info-windows
		- \|
		echo "Printing common information for build job."
		echo "Current job is run on commit $CI_COMMIT_SHA"
		echo "Commit time was $CI_COMMIT_TIMESTAMP"
		("echo 'System time is'", "Get-Date -Format 'dddd dd/MM/yyyy HH:mm K'") \| Invoke-Expression

		.activate-debug-mode-info-if-set: &activate-debug-mode-info-if-set
		- if [ "$BUILD_WITH_DEBUG_MODE_INFO" = "true" ]; then
		- sed -i.bak -e "s/\/\\ $#define\ DEBUGGING\ $\*\//\1/g" lib_com/options.h
		@@ -199,6 +207,10 @@ stages:
		.activate-Werror-linux: &activate-Werror-linux
		- sed -i.bak "s/^# $CFLAGS += -Werror$/\1/" Makefile

		.activate-WX-windows: &activate-WX-windows
		- (Get-Content -Path "CMakeLists.txt") -replace '# $add_compile_options\("\/WX"$\)', '$1' \| Set-Content -Path "CMakeLists.txt"
		- Get-ChildItem -Path "Workspace_msvc" -Filter "*.vcxproj" \| ForEach-Object { (Get-Content -Path $_.FullName) -replace '<TreatWarningAsError>false', '<TreatWarningAsError>true' \| Set-Content -Path $_.FullName }

		.rules-pytest-to-ref-short:
		rules:
		- if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == "pytest-compare"
		@@ -265,6 +277,13 @@ stages:
		tags:
		- ivas-basop-linux

		.build-job-windows:
		stage: build
		needs: []
		timeout: "4 minutes"
		tags:
		- ivas-windows

		# template for test jobs on linux that need the TESTV_DIR
		.test-job-linux-needs-testv-dir:
		extends: .test-job-linux
		@@ -318,7 +337,7 @@ stages:
		- python3 scripts/parse_xml_report.py report-junit.xml $CSV_ARTIFACT_NAME $REPORT_ARG
		- mkdir $IMAGES_ARTIFACT_NAME
		- for MEASURE in $summary_args;do python3 scripts/create_histogram_summary.py $CSV_ARTIFACT_NAME $IMAGES_ARTIFACT_NAME/summary_"$MEASURE".csv $IMAGES_ARTIFACT_NAME/summary_"$MEASURE".png --measure $MEASURE; done
		- python3 ci/basop-pages/create_summary_page.py $SUMMARY_HTML_ARTIFACT_NAME $CI_JOB_ID $CI_JOB_NAME
		- python3 ci/basop-pages/create_summary_page.py $SUMMARY_HTML_ARTIFACT_NAME $CI_JOB_ID $CI_JOB_NAME --measures $summary_args

		- if [ $USE_LTV -eq 1 ] && [ "$CI_COMMIT_BRANCH" == "$CI_DEFAULT_BRANCH" ]; then
		- id_previous=$(python3 ci/get_id_of_last_job_occurence.py $CI_DEFAULT_BRANCH $CI_JOB_NAME $CI_PROJECT_ID)
		@@ -723,6 +742,24 @@ build-codec-linux-debugging-make:
		- *activate-debug-mode-info-if-set
		- make -j

		build-codec-windows-msbuild:
		rules:
		- if: $CI_PIPELINE_SOURCE == 'web'
		- if: $CI_PIPELINE_SOURCE == 'push' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
		- if: $CI_PIPELINE_SOURCE == 'merge_request_event' # trigger build job for all MRs
		- if: $CI_PIPELINE_SOURCE == 'schedule'
		- if: $CI_PIPELINE_SOURCE == 'push'
		when: never
		extends:
		- .build-job-windows
		timeout: "7 minutes"
		tags:
		- ivas-windows
		script:
		- *print-common-info-windows
		- *activate-WX-windows
		- MSBuild.exe -maxcpucount .\Workspace_msvc\Workspace_msvc.sln /property:Configuration=Debug

		# ---------------------------------------------------------------
		# Short test jobs that run in merge request pipelines
		# ---------------------------------------------------------------
		@@ -845,6 +882,8 @@ ivas-pytest-compare_to_ref-short-enc-lev+10:
		ivas-pytest-enc-msan:
		extends:
		- .test-job-linux
		tags:
		- ivas-basop-linux-fast
		before_script:
		- CLANG_NUM=1
		- DUT_DECODER_PATH=./$REF_DECODER_PATH
		@@ -854,6 +893,8 @@ ivas-pytest-enc-msan:
		ivas-pytest-enc-asan:
		extends:
		- .test-job-linux
		tags:
		- ivas-basop-linux-fast
		before_script:
		- CLANG_NUM=2
		- DUT_DECODER_PATH=./$REF_DECODER_PATH
		@@ -863,6 +904,8 @@ ivas-pytest-enc-asan:
		ivas-pytest-enc-usan:
		extends:
		- .test-job-linux
		tags:
		- ivas-basop-linux-fast
		before_script:
		- CLANG_NUM=3
		- DUT_DECODER_PATH=./$REF_DECODER_PATH
		@@ -929,6 +972,8 @@ ivas-pytest-compare-to-input-short-enc:
		ivas-pytest-dec-msan:
		extends:
		- .test-job-linux
		tags:
		- ivas-basop-linux-fast
		before_script:
		- CLANG_NUM=1
		- DUT_ENCODER_PATH=./$REF_ENCODER_PATH
		@@ -938,6 +983,8 @@ ivas-pytest-dec-msan:
		ivas-pytest-dec-asan:
		extends:
		- .test-job-linux
		tags:
		- ivas-basop-linux-fast
		before_script:
		- CLANG_NUM=2
		- DUT_ENCODER_PATH=./$REF_ENCODER_PATH
		@@ -947,6 +994,8 @@ ivas-pytest-dec-asan:
		ivas-pytest-dec-usan:
		extends:
		- .test-job-linux
		tags:
		- ivas-basop-linux-fast
		before_script:
		- CLANG_NUM=3
		- DUT_ENCODER_PATH=./$REF_ENCODER_PATH

Workspace_msvc/lib_enc.vcxproj

+0 −2

Original line number	Diff line number	Diff line
		@@ -379,8 +379,6 @@
		<ClCompile Include="..\lib_enc\multi_harm.c" />
		<ClCompile Include="..\lib_enc\nelp_enc.c" />
		<ClCompile Include="..\lib_enc\nelp_enc_fx.c" />
		<ClCompile Include="..\lib_enc\noise_adjust.c" />
		<ClCompile Include="..\lib_enc\nois_est.c" />
		<ClCompile Include="..\lib_enc\pitch_ol.c" />
		<ClCompile Include="..\lib_enc\pitch_ol2.c" />
		<ClCompile Include="..\lib_enc\pit_enc.c" />

Workspace_msvc/lib_enc.vcxproj.filters

+0 −4

Original line number	Diff line number	Diff line
		@@ -216,10 +216,6 @@
		<ClCompile Include="..\lib_enc\multi_harm.c">
		<Filter>enc_all_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_enc\nois_est.c">
		<Filter>enc_all_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_enc\noise_adjust.c">
		<Filter>enc_all_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_enc\pit_enc.c">

lib_com/basop_util.c

+8 −7

Original line number	Diff line number	Diff line
		@@ -45,9 +45,6 @@
		#include "basop_settings.h"
		#include "cnst.h"


		#define WMC_TOOL_SKIP

		extern const Word32 SqrtTable[32]; // Q31
		extern const Word16 SqrtDiffTable[32]; /* Q15 */

		@@ -405,7 +402,9 @@ static Word16 ISqrt16_common( Word16 m,

		/* handle even exponents */
		if ( s_and( e, 1 ) == 0 )
		{
		m = mult_r( m, 0x5a82 );
		}

		return m;
		}
		@@ -420,8 +419,11 @@ static Word32 ISqrt32_common( Word32 m,
		#endif

		assert( m >= 0x40000000 );

		#ifdef BASOP_NOGLOB_DECLARE_LOCAL
		m16 = round_fx_o( m, &Overflow );
		#else
		m16 = round_fx( m );
		#endif

		/* get table index (upper 6 bits minus 32) */
		/* index = (m16 >> 25) - 32; */
		@@ -435,7 +437,9 @@ static Word32 ISqrt32_common( Word32 m,

		/* handle even exponents */
		if ( s_and( e, 1 ) == 0 )
		{
		m = Mpy_32_16_1( m, 0x5a82 );
		}

		return m;
		}
		@@ -2653,6 +2657,3 @@ cmplx CL_mult_32x16( cmplx input, cmplx_s coeff )
		#endif
		return result;
		}


		#undef WMC_TOOL_SKIP

lib_com/ivas_rom_com_fx.c

+10 −0

Original line number	Diff line number	Diff line
		@@ -1356,6 +1356,16 @@ const UWord32 tdm_ratio_tabl_fx[TDM_NQ + 1] = {
		2147483647, 2147483647, 2147483647
		};

		// Q30
		const Word32 tdm_ratio_tabl_fx_Q30[] = {
		0, 0, 11703786, 26306674, 46385648, 71940704, 102542344, 137868448,
		177596896, 221298192, 268435456, 318471840, 370977792, 425201760, 480714208,
		536870912, 593027584, 648540032, 702764032, 755270016, 805306368, 852443648,
		896144896, 935873344, 971199488, 1001801152, 1027356160, 1047435136,
		1062038016, 1073741824, 1073741824, 1073741824
		};


		// Q24
		const Word32 tdm_ratio_tabl_fx_Q24[TDM_NQ + 1] = {
		0, 0, 182871, 411041, 724775, 1124073, 1602224, 2154194,