Merge branch 'main' into 1030-incorrect-wmc-counting-of-single-precisison-cosf-sinf-tanf (ddd55d6c) · Commits · IVAS Codec Public Collaboration / IVAS Codec

.gitlab-ci.yml

+35 −7

Original line number	Diff line number	Diff line
		@@ -201,7 +201,23 @@ stages:
		- make clean
		- make -j CLANG=$CLANG_NUM
		- testcase_timeout=$SELFTEST_SANITY_TIMEOUT
		- UBSAN_OPTIONS=suppressions=scripts/ubsan.supp,report_error_type=1 python3 -m pytest $SELF_TEST_PRM_FILE -v --update_ref 1 -m create_ref --html=report.html --self-contained-html --junit-xml=report-junit.xml --testcase_timeout=$testcase_timeout --ref_encoder_path ./IVAS_cod --ref_decoder_path ./IVAS_dec
		- export UBSAN_OPTIONS=suppressions=scripts/ubsan.supp,report_error_type=1

		- exit_code20=0
		- exit_code10=0
		- exit_code5=0

		- if [ $CLANG_NUM -eq 1 ]; then sanitizer_type="MemorySanitizer"; elif [ $CLANG_NUM -eq 2 ]; then sanitizer_type="AddressSanitizer"; elif [ $CLANG_NUM -eq 3 ]; then sanitizer_type="UndefinedBehaviorSanitizer"; else echo "Wrong CLANG_NUM $CLANG_NUM given!"; exit 1; fi

		# run encoder and decoder with 20ms renderer framesize first, use reference creation mode
		- python3 -m pytest $SELF_TEST_PRM_FILE -v --update_ref 1 -m create_ref --html=report-20ms.html --self-contained-html --junit-xml=report-junit-20ms.xml --testcase_timeout=$testcase_timeout --ref_encoder_path ./IVAS_cod --ref_decoder_path ./IVAS_dec \|\| exit_code20=$?
		# for 10ms and 5ms renderer framesize, we only need to run the decoder part as renderer framesize is a decoder-only option
		# set tolerance very high do ignore any BE differences due to the different renderer framesizes, those can appear due to the limiter being active
		# we are only interested in runtime errors from the sanitizers and ignore the diffs
		- python3 -m pytest $SELF_TEST_PRM_FILE -v --html=report-5ms.html --self-contained-html --junit-xml=report-junit-5ms.xml --dut_fr 5 --decoder_only --abs_tol 100000 \|\| exit_code5=$?
		- python3 -m pytest $SELF_TEST_PRM_FILE -v --html=report-10ms.html --self-contained-html --junit-xml=report-junit-10ms.xml --dut_fr 10 --decoder_only --abs_tol 100000 \|\| exit_code10=$?

		- if [ $exit_code20 -ne 0 ] \|\| [ $exit_code10 -ne 0 ] \|\| [ $exit_code5 -ne 0 ]; then exit 1; fi


		# ---------------------------------------------------------------
		@@ -283,12 +299,18 @@ stages:
		expire_in: 1 week
		when: always
		paths:
		- report-junit.xml
		- report.html
		- report-junit-20ms.xml
		- report-junit-10ms.xml
		- report-junit-5ms.xml
		- report-20ms.html
		- report-10ms.html
		- report-5ms.html
		expose_as: "Sanitizer selftest results"
		reports:
		junit:
		- report-junit.xml
		- report-junit-20ms.xml
		- report-junit-10ms.xml
		- report-junit-5ms.xml

		.sanitizer-selftest-ltv:
		stage: test
		@@ -299,12 +321,18 @@ stages:
		expire_in: 2 week
		when: always
		paths:
		- report-junit.xml
		- report.html
		- report-junit-20ms.xml
		- report-junit-10ms.xml
		- report-junit-5ms.xml
		- report-20ms.html
		- report-10ms.html
		- report-5ms.html
		expose_as: "Sanitizer selftest results"
		reports:
		junit:
		- report-junit.xml
		- report-junit-20ms.xml
		- report-junit-10ms.xml
		- report-junit-5ms.xml

		# ---------------------------------------------------------------
		# .pre jobs for setting up things

ci/complexity_measurements/mergeNewsletterRam.py

+0 −1

Original line number	Diff line number	Diff line
		@@ -29,7 +29,6 @@
		# accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
		# the United Nations Convention on Contracts on the International Sales of Goods.
		import csv
		import re
		import sys

		newsletterFilename = ""

ci/complexity_measurements/mergeNewsletterRom.py

+0 −1

Original line number	Diff line number	Diff line
		@@ -29,7 +29,6 @@
		# accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
		# the United Nations Convention on Contracts on the International Sales of Goods.
		import csv
		import re
		import sys

		newsletterFilename = ""

lib_com/ivas_prot.h

+5 −0

Original line number	Diff line number	Diff line
		@@ -1095,11 +1095,13 @@ void ivas_param_ism_dec_close(
		const AUDIO_CONFIG output_config /* i : output audio configuration */
		);

		#ifndef FIX_1022_REMOVE_PARAMISM_DEC
		void ivas_param_ism_dec(
		Decoder_Struct st_ivas, / i/o: IVAS decoder structure */
		float output_f[] / i/o: synthesized core-coder transport channels/DirAC output */
		);

		#endif
		void ivas_ism_dec_digest_tc(
		Decoder_Struct st_ivas / i/o: IVAS decoder structure */
		);
		@@ -5216,6 +5218,9 @@ void ivas_ism_renderer_close(

		void ivas_ism_render_sf(
		Decoder_Struct st_ivas, / i/o: IVAS decoder structure */
		#ifdef NONBE_FIX_1021_ISM_BRIR_RS_FLUSH
		const RENDERER_TYPE renderer_type, /* i : active renderer type */
		#endif
		float output_f[], / i/o: core-coder transport channels/object output */
		const int16_t n_samples_to_render /* i : output frame length per channel */
		);

lib_com/options.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -159,6 +159,7 @@
		#define FIX_1027_GSC_INT_OVERFLOW /* VA: issue 2207: overflow in GSC */
		#define FIX_1024_REMOVE_PARAMMC_MIXING_MAT /* VA: issue 1024: remove unused function ivas_param_mc_get_mono_stereo_mixing_matrices() */
		#define FIX_1023_REMOVE_PARAMMC_DEC /* VA: issue 1023: remove unused function ivas_param_mc_dec() */
		#define FIX_1022_REMOVE_PARAMISM_DEC /* VA: issue 1022: remove unused function ivas_param_ism_dec() */

		/* #################### End BE switches ################################## */

		@@ -166,6 +167,7 @@
		/* any switch which is non-be wrt selection floating point code */
		/* all switches in this category should start with "NONBE_" */

		#define NONBE_FIX_1021_ISM_BRIR_RS_FLUSH /* FhG: issue #1021: fix ISM with JBM and RS renderer flushing*/

		/* ##################### End NON-BE switches ########################### */