Merge branch 'main' into 1006-usan-nan-value-out-of-range-for-type-short-in-stereo-to-mono-decoding (93c67b8a) · Commits · IVAS Codec Public Collaboration / IVAS Codec

.gitlab-ci.yml

+5 −2

Original line number	Diff line number	Diff line
		@@ -549,6 +549,8 @@ pytest-compare-20ms-and-5ms-rendering:
		- python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR -v --update_ref 1 -m create_ref_part2
		### run pytest
		- exit_code=0
		- exit_code5=0
		- exit_code10=0
		- python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR -v --html=report-5ms.html --self-contained-html --junit-xml=report-junit-5ms.xml --dut_fr 5 --decoder_only \|\| exit_code5=$?
		- python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR -v --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
		@@ -2040,8 +2042,9 @@ coverage-test-on-main-scheduled:
		- python3 tests/create_short_testvectors.py
		- python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR -v -n auto --update_ref 1 -m create_ref --ref_encoder_path ./IVAS_cod --ref_decoder_path ./IVAS_dec
		- python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR -v -n auto --update_ref 1 -m create_ref_part2 --ref_encoder_path ./IVAS_cod --ref_decoder_path ./IVAS_dec
		- python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR -v --dut_encoder_path ./IVAS_cod --dut_decoder_path ./IVAS_dec --dut_fr 5 --decoder_only
		- python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR -v --dut_encoder_path ./IVAS_cod --dut_decoder_path ./IVAS_dec --dut_fr 10 --decoder_only
		# need to ignore non-zero exit codes as limiter is active and thus the different framesiszes will not be BE in all cases
		- python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR -v --dut_encoder_path ./IVAS_cod --dut_decoder_path ./IVAS_dec --dut_fr 5 --decoder_only \|\| true
		- python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR -v --dut_encoder_path ./IVAS_cod --dut_decoder_path ./IVAS_dec --dut_fr 10 --decoder_only \|\| true
		- python3 -m pytest -q -n auto tests/renderer/test_renderer.py --create_ref
		- python3 -m pytest -q -n auto tests/renderer/test_renderer.py --create_cut
		- lcov -c -d obj -o coverage_stv.info # extract coverage of short test vectors here

lib_com/options.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -159,6 +159,8 @@
		#define FIX_998_UNUSED_FUNCTION /* FhG: issue 998: delete unused funtion ivas_dirac_dec_get_response_split_order */
		#define FIX_1009_ISM_NONDIEGETIC_PANNING /* FhG: issue #1009: use correct object buffer for ISM1 non-diegetic pan */
		#define FIX_993_REMOVE_SBA_GET_ORDER /* VA: issue 993: remove unused function ivas_sba_get_order() */
		#define FIX_1002_DEC_PHASE_ECU_USAN_OF_PHASE /* Eri: issue #1002, usan-value-out-of-range-for-int16, kept BE for PLC-conditions */
		#define FIX_960_SYN_OUTPUT /* VA: issue 960: unused function syn_output() is removed */

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

lib_com/prot.h

+4 −0

Original line number	Diff line number	Diff line
		@@ -161,12 +161,14 @@ int16_t sum_s(
		const int16_t lvec /* i : length of input vector */
		);

		#ifdef DEBUGGING
		/! r: sum of all vector elements /
		int32_t sum_l(
		const int32_t vec, / i : input vector */
		const int16_t lvec /* i : length of input vector */
		);

		#endif
		/! r: sum of all vector elements /
		float sum_f(
		const float vec, / i : input vector */
		@@ -4822,12 +4824,14 @@ void dec_acelp_4t64(
		const int16_t Opt_AMR_WB /* i : flag indicating AMR-WB IO mode */
		);

		#ifndef FIX_960_SYN_OUTPUT
		uint32_t syn_output(
		float synth, / i/o: float synthesis signal */
		const int16_t output_frame, /* i : output frame length */
		int16_t synth_out / o : integer 16 bits synthesis signal */
		);

		#endif
		void FEC_exc_estim(
		Decoder_State st, / i/o: Decoder static memory */
		const int16_t L_frame, /* i : length of the frame */

lib_com/tools.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -138,6 +138,7 @@ int16_t sum_s(
		return tmp;
		}

		#ifdef DEBUGGING
		/! r: sum of all vector elements /
		int32_t sum_l(
		const int32_t vec, / i : input vector */
		@@ -156,6 +157,7 @@ int32_t sum_l(
		return tmpL;
		}

		#endif
		/! r: sum of all vector elements /
		float sum_f(
		const float vec, / i : input vector */

lib_dec/FEC_HQ_phase_ecu.c

+11 −1

Original line number	Diff line number	Diff line
		@@ -973,7 +973,6 @@ static void subst_spec(
		float alpha_local;
		float beta_local;


		sincos = sincos_t_ext + 128;
		Lprot = (int16_t) ( L_PROT32k * output_frame / 640 );
		Lprot_1 = 1.0f / Lprot;
		@@ -1092,7 +1091,14 @@ static void subst_spec(
		}

		Xph = corr_phase[m];
		#ifdef FIX_1002_DEC_PHASE_ECU_USAN_OF_PHASE
		/* extract fractional phase integer index in the range [0...1023] */
		Xph_short = (int16_t) ( 0x000003ff & (int32_t) ( ( Xph * 512 ) / EVS_PI ) );
		#else
		Xph_short = (int16_t) ( ( (int32_t) ( Xph * 512 / EVS_PI ) ) % 32768 ) & 0x03ff;
		#endif


		if ( Xph_short >= 512 )
		{
		sin_F = -sincos_t_ext[Xph_short - 512];
		@@ -1136,7 +1142,11 @@ static void subst_spec(
		mag_chg_local = 0.5f + ( 1.0f - ( 1.0f / PHASE_DITH ) ph_dith ) * 0.5f;
		}

		#ifdef FIX_1002_DEC_PHASE_ECU_USAN_OF_PHASE
		Xph_short = (int16_t) ( ( (int32_t) ( ( Xph * 512 ) / EVS_PI ) ) & 0x000003ff );
		#else
		Xph_short = (int16_t) ( Xph * 512 / EVS_PI ) & 0x03ff;
		#endif

		if ( Xph_short >= 512 )
		{