Merge branch 'main' of forge.3gpp.org:ivas-codec-pc/ivas-codec into... (52144fac) · Commits · IVAS Codec Public Collaboration / IVAS Codec

.gitlab-ci.yml

+4 −0

Original line number	Diff line number	Diff line
		@@ -2248,9 +2248,13 @@ coverage-test-on-main-scheduled:
		- cp IVAS_rend IVAS_rend_ref # Copy exec to be able to run renderer script
		- 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 -n auto --update_ref 1 -m create_ref --ref_encoder_path ./IVAS_cod --ref_decoder_path ./IVAS_dec --use_ltv
		- 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 --use_ltv
		# 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 $TESTS_DIR_CODEC_BE_ON_MR -v --dut_encoder_path ./IVAS_cod --dut_decoder_path ./IVAS_dec --dut_fr 5 --decoder_only --use_ltv \|\| 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 --use_ltv \|\| 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 −1

Original line number	Diff line number	Diff line
		@@ -174,7 +174,8 @@
		#define FIX_RETURN /* VA: fix location of function returns */
		#endif
		#define FIX_1135_EXT_RENDERER_HANDLES /* VA: issue 1135: Memory usage reduction in external renderer: Allocate only handles that are really needed. */
		#define FIX_835_PARAMMC_BUFFER_VALUES /* FhG: issue 835: wide range of buffer values for cx in ParamMC */
		#define FIX_1166_TDREND_DIV0 /* FhG,Eri: issue 1166: potential divide by zero in TD Renderer */
		#define FIX_835_PARAMMC_BUFFER_VALUES /* FhG: BASOP issue 835: wide range of buffer values for cx in ParamMC */

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

lib_rend/ivas_objectRenderer_hrFilt.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -218,8 +218,13 @@ static void GenerateFilter(
		ESynL += modelEval->BMEnergiesL[modelEval->UseIndsL[i]].val;
		ESynR += modelEval->BMEnergiesR[modelEval->UseIndsR[i]].val;
		}
		#ifdef FIX_1166_TDREND_DIV0
		ScaleL = sqrtf( ETotL / ( ESynL + EPSILON ) );
		ScaleR = sqrtf( ETotR / ( ESynR + EPSILON ) );
		#else
		ScaleL = sqrtf( ETotL / ESynL );
		ScaleR = sqrtf( ETotR / ESynR );
		#endif

		/* Build using only the most energetic components. */
		for ( k = model->iSecFirst[iSec]; k <= model->iSecLast[iSec]; k++ )

scripts/reverb/acoustic_environment_hospital_patientroom.cfg

deleted100644 → 0

+0 −32

Original line number	Diff line number	Diff line
		[roomAcoustics]
		frequencyGridCount = 1;
		acousticEnvironmentCount = 1;

		[frequencyGrid:0]
		method = individualFrequencies;
		frequencies = [
		20.0, 25.0, 31.5, 40.0,
		50.0, 63.0, 80.0, 100.0,
		125.0, 160.0, 200.0, 250.0,
		315.0, 400.0, 500.0, 630.0,
		800.0, 1000.0, 1250.0, 1600.0,
		2000.0, 2500.0, 3150.0, 4000.0,
		5000.0, 6300.0, 8000.0, 10000.0,
		12500.0, 16000.0, 20000.0];

		[acousticEnvironment:0]
		id = 0;
		frequencyGridIndex = 0;
		predelay = 0.08163;
		rt60 = [
		0.81275, 0.61888, 0.45111, 0.34672, 0.46683, 0.53987, 0.61874, 0.70291, 0.66657, 0.73037,
		0.75090, 0.72470, 0.75486, 0.75857, 0.76844, 0.74999, 0.77622, 0.78227, 0.77441, 0.74688,
		0.73521, 0.73782, 0.71928, 0.71708, 0.71465, 0.60592, 0.52031, 0.51768, 0.52102, 0.37956,
		0.30786];

		dsr = [
		0.00019952621, 0.00019952621, 7.9432844e-05, 5.0118702e-05, 7.943284e-06, 6.3095763e-06, 6.3095763e-06, 7.943284e-06, 1e-05, 1e-05,
		7.943284e-06, 1e-05, 1e-05, 1e-05, 7.943284e-06, 1e-05, 1e-05, 7.943284e-06, 7.943284e-06, 6.3095763e-06,
		6.3095763e-06, 6.3095763e-06, 6.3095763e-06, 6.3095763e-06, 6.3095763e-06, 3.1622776e-06, 3.1622776e-06, 3.1622776e-06, 6.3095763e-07, 3.1622776e-07,
		3.1622776e-07];

scripts/reverb/acoustic_environment_recreation.cfg

deleted100644 → 0

+0 −32

Original line number	Diff line number	Diff line
		[roomAcoustics]
		frequencyGridCount = 1;
		acousticEnvironmentCount = 1;

		[frequencyGrid:0]
		nBands = 31;
		method = individualFrequencies;
		frequencies = [
		20.0, 25.0, 31.5, 40.0,
		50.0, 63.0, 80.0, 100.0,
		125.0, 160.0, 200.0, 250.0,
		315.0, 400.0, 500.0, 630.0,
		800.0, 1000.0, 1250.0, 1600.0,
		2000.0, 2500.0, 3150.0, 4000.0,
		5000.0, 6300.0, 8000.0, 10000.0,
		12500.0, 16000.0, 20000.0];

		[acousticEnvironment:0]
		id = 0;
		frequencyGridIndex = 0;
		predelay = 0.43031;
		rt60 = [
		4.51916, 4.89553, 4.83276, 5.00198, 5.34468, 5.76026, 6.36818, 6.95503, 7.27557, 7.62559,
		8.08892, 8.16002, 8.13900, 8.17919, 8.16280, 8.46226, 9.61806, 9.93048, 9.81353, 8.59340,
		8.38885, 8.36823, 6.51845, 3.76089, 3.75374, 3.57451, 1.28724, 1.22174, 1.22448, 1.71631,
		2.14343];

		dsr = [
		1e-06, 7.943284e-07, 1e-06, 1e-06, 1.5848925e-06, 1.9952631e-06, 3.1622776e-06, 3.9810707e-06, 6.3095763e-06, 7.943284e-06,
		1e-05, 7.943284e-06, 7.943284e-06, 7.943284e-06, 7.943284e-06, 7.943284e-06, 5.01187e-06, 5.01187e-06, 3.9810707e-06, 3.1622776e-06,
		3.1622776e-06, 2.511887e-06, 7.943284e-07, 6.3095763e-07, 6.3095763e-07, 5.01187e-08, 1.2589251e-08, 1.2589251e-08, 1.2589265e-09, 1.2589266e-11,
		3.981075e-12];