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

.gitlab-ci.yml

+89 −14

Original line number	Diff line number	Diff line
		@@ -2297,7 +2297,7 @@ complexity-stereo-in-ext-out:
		- *complexity-measurements-prepare-artifacts
		- exit $ret_val

		complexity-ism-in-binaural_room_reverb-out:
		complexity-ism-in-binaural-out:
		extends:
		- .complexity-template
		rules:
		@@ -2306,7 +2306,22 @@ complexity-ism-in-binaural_room_reverb-out:
		start_in: 1 hour
		script:
		- in_format=ISM
		- out_format=BINAURAL_ROOM_REVERB
		- out_format=BINAURAL
		- ret_val=0
		- bash ci/complexity_measurements/getWmops.sh "ISM+1 ISM+2 ISM+3 ISM+4" "$out_format" \|\| ret_val=$?
		- *complexity-measurements-prepare-artifacts
		- exit $ret_val

		complexity-ism-in-binaural_room_ir-out:
		extends:
		- .complexity-template
		rules:
		- if: $MEASURE_COMPLEXITY_LINUX
		when: delayed
		start_in: 2 hours
		script:
		- in_format=ISM
		- out_format=BINAURAL_ROOM_IR
		- ret_val=0
		- bash ci/complexity_measurements/getWmops.sh "ISM+1 ISM+2 ISM+3 ISM+4" "$out_format" \|\| ret_val=$?
		- *complexity-measurements-prepare-artifacts
		@@ -2318,7 +2333,7 @@ complexity-ism-in-ext-out:
		rules:
		- if: $MEASURE_COMPLEXITY_LINUX
		when: delayed
		start_in: 3 hour
		start_in: 3 hours
		script:
		- in_format=ISM
		- out_format=EXT
		@@ -2342,13 +2357,28 @@ complexity-sba-hoa3-in-ext-out:
		- *complexity-measurements-prepare-artifacts
		- exit $ret_val

		complexity-sba-hoa3-in-binaural_room_ir-out:
		complexity-sba-hoa3-in-binaural-out:
		extends:
		- .complexity-template
		rules:
		- if: $MEASURE_COMPLEXITY_LINUX
		when: delayed
		start_in: 5 hours
		script:
		- in_format=HOA3
		- out_format=BINAURAL
		- ret_val=0
		- bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" \|\| ret_val=$?
		- *complexity-measurements-prepare-artifacts
		- exit $ret_val

		complexity-sba-hoa3-in-binaural_room_ir-out:
		extends:
		- .complexity-template
		rules:
		- if: $MEASURE_COMPLEXITY_LINUX
		when: delayed
		start_in: 6 hours
		script:
		- in_format=HOA3
		- out_format=BINAURAL_ROOM_IR
		@@ -2363,7 +2393,7 @@ complexity-mc-in-ext-out:
		rules:
		- if: $MEASURE_COMPLEXITY_LINUX
		when: delayed
		start_in: 6 hours
		start_in: 7 hours
		script:
		- in_format=MC
		- out_format=EXT
		@@ -2372,13 +2402,28 @@ complexity-mc-in-ext-out:
		- *complexity-measurements-prepare-artifacts
		- exit $ret_val

		complexity-mc-in-binaural-out:
		extends:
		- .complexity-template
		rules:
		- if: $MEASURE_COMPLEXITY_LINUX
		when: delayed
		start_in: 8 hours
		script:
		- in_format=MC
		- out_format=BINAURAL
		- ret_val=0
		- bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" \|\| ret_val=$?
		- *complexity-measurements-prepare-artifacts
		- exit $ret_val

		complexity-mc-in-binaural_room_ir-out:
		extends:
		- .complexity-template
		rules:
		- if: $MEASURE_COMPLEXITY_LINUX
		when: delayed
		start_in: 7 hours
		start_in: 9 hours
		script:
		- in_format=MC
		- out_format=BINAURAL_ROOM_IR
		@@ -2393,7 +2438,7 @@ complexity-masa-in-ext-out:
		rules:
		- if: $MEASURE_COMPLEXITY_LINUX
		when: delayed
		start_in: 8 hours
		start_in: 10 hours
		script:
		- in_format=MASA
		- out_format=EXT
		@@ -2408,7 +2453,7 @@ complexity-masa-in-binaural-out:
		rules:
		- if: $MEASURE_COMPLEXITY_LINUX
		when: delayed
		start_in: 9 hours
		start_in: 11 hours
		script:
		- in_format=MASA
		- out_format=BINAURAL
		@@ -2423,7 +2468,7 @@ complexity-masa-in-hoa3-out:
		rules:
		- if: $MEASURE_COMPLEXITY_LINUX
		when: delayed
		start_in: 10 hours
		start_in: 12 hours
		script:
		- in_format=MASA
		- out_format=HOA3
		@@ -2438,7 +2483,7 @@ complexity-omasa-in-ext-out:
		rules:
		- if: $MEASURE_COMPLEXITY_LINUX
		when: delayed
		start_in: 11 hours
		start_in: 13 hours
		script:
		- in_format=OMASA
		- out_format=EXT
		@@ -2453,7 +2498,7 @@ complexity-omasa-in-binaural-out:
		rules:
		- if: $MEASURE_COMPLEXITY_LINUX
		when: delayed
		start_in: 12 hours
		start_in: 14 hours
		script:
		- in_format=OMASA
		- out_format=BINAURAL
		@@ -2462,13 +2507,28 @@ complexity-omasa-in-binaural-out:
		- *complexity-measurements-prepare-artifacts
		- exit $ret_val

		complexity-omasa-in-hoa3-out:
		extends:
		- .complexity-template
		rules:
		- if: $MEASURE_COMPLEXITY_LINUX
		when: delayed
		start_in: 15 hours
		script:
		- in_format=OMASA
		- out_format=HOA3
		- ret_val=0
		- bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" \|\| ret_val=$?
		- *complexity-measurements-prepare-artifacts
		- exit $ret_val

		complexity-StereoDmxEVS-stereo-in-mono-out:
		extends:
		- .complexity-template
		rules:
		- if: $MEASURE_COMPLEXITY_LINUX
		when: delayed
		start_in: 13 hours
		start_in: 16 hours
		script:
		- in_format=StereoDmxEVS
		- out_format=mono
		@@ -2483,7 +2543,7 @@ complexity-osba-in-ext-out:
		rules:
		- if: $MEASURE_COMPLEXITY_LINUX
		when: delayed
		start_in: 14 hours
		start_in: 17 hours
		script:
		- in_format=OSBA
		- out_format=EXT
		@@ -2492,13 +2552,28 @@ complexity-osba-in-ext-out:
		- *complexity-measurements-prepare-artifacts
		- exit $ret_val

		complexity-osba-in-binaural-out:
		extends:
		- .complexity-template
		rules:
		- if: $MEASURE_COMPLEXITY_LINUX
		when: delayed
		start_in: 18 hours
		script:
		- in_format=OSBA
		- out_format=BINAURAL
		- ret_val=0
		- bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" \|\| ret_val=$?
		- *complexity-measurements-prepare-artifacts
		- exit $ret_val

		complexity-osba-in-binaural_room_ir-out:
		extends:
		- .complexity-template
		rules:
		- if: $MEASURE_COMPLEXITY_LINUX
		when: delayed
		start_in: 15 hours
		start_in: 19 hours
		script:
		- in_format=OSBA
		- out_format=BINAURAL_ROOM_IR

ci/setup_pages.py

+6 −1

Original line number	Diff line number	Diff line
		@@ -20,18 +20,23 @@ JOBS_FLOAT_REPO = {
		# "complexity-masa-in-7_1_4-out": "[OLD] Masa in, 7_1_4 out",
		# current ones
		"complexity-stereo-in-ext-out": "Stereo in, EXT out",
		"complexity-ism-in-binaural_room_reverb-out": "ISM in, BINAURAL_ROOM_REVERB out",
		"complexity-ism-in-binaural-out": "ISM in, BINAURAL out",
		"complexity-ism-in-binaural_room_ir-out": "ISM in, BINAURAL_ROOM_IR out",
		"complexity-ism-in-ext-out": "ISM in, EXT out",
		"complexity-sba-hoa3-in-ext-out": "HOA3 in, EXT out",
		"complexity-sba-hoa3-in-binaural-out": "HOA3 in, BINAURAL out",
		"complexity-sba-hoa3-in-binaural_room_ir-out": "HOA3 in, BINAURAL_ROOM_IR out",
		"complexity-mc-in-ext-out": "MC in, EXT out",
		"complexity-mc-in-binaural-out": "MC in, BINAURAL out",
		"complexity-mc-in-binaural_room_ir-out": "MC in, BINAURAL_ROOM_IR out",
		"complexity-masa-in-ext-out": "MASA in, EXT out",
		"complexity-masa-in-binaural-out": "MASA in, BINAURAL out",
		"complexity-masa-in-hoa3-out": "MASA in, HOA3 out",
		"complexity-omasa-in-ext-out": "OMASA in, EXT out",
		"complexity-omasa-in-binaural-out": "OMASA in, BINAURAL out",
		"complexity-omasa-in-hoa3-out": "OMASA in, HOA3 out",
		"complexity-osba-in-ext-out": "OSBA in, EXT out",
		"complexity-osba-in-binaural-out": "OSBA in, BINAURAL out",
		"complexity-osba-in-binaural_room_ir-out": "OSBA in, BINAURAL_ROOM_IR out",
		"complexity-StereoDmxEVS-stereo-in-mono-out": "StereoDmxEVS, Stereo in, Mono out",
		# "timeless" jobs (not complexity)

lib_com/ivas_rom_com.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -1876,6 +1876,7 @@ const float ivas_param_mc_dmx_fac_CICP19_3tc[36] =
		0.0f, 0.0f, 1.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f /Ct/
		};

		#ifndef FIX_1157_OBSOLETE_DMX_TABLE
		const float ivas_param_mc_dmx_fac_CICP19_4tc[48] =
		{
		1.0f, 0.0f, INV_SQRT2, INV_SQRT2, 1.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, /Lht/
		@@ -1883,6 +1884,7 @@ const float ivas_param_mc_dmx_fac_CICP19_4tc[48] =
		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f, /Lut/
		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, /Rut/
		};
		#endif

		/* Coefficient for Parametric MC ILD factorization */
		const float ivas_param_mc_ild_fac_CICP6_2tc[6] =

lib_com/options.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -172,6 +172,7 @@
		#endif
		#define FIX_1129_EXT_REND_OUTPUT_HIGH /* Philips: issue 1129: External renderer BINAURAL_ROOM_REVERB format output level too high compared to internal rendering output */
		#define FIX_1152_UNINIT_VAL_IN_ITD_VAD_COMPUTATION /* FhG: fix uninitialized value being used in ITD VAD mid signal computation that does not affect synthesis, but crashes BASOPs */
		#define FIX_1157_OBSOLETE_DMX_TABLE /* FhG: remove obsolte ParamMC DMX table ivas_param_mc_dmx_fac_CICP19_4tc[] */

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

		@@ -180,6 +181,7 @@
		/* all switches in this category should start with "NONBE_" */

		#define NONBE_FIX_1141_OSBA_ROOM_RENDERING /* FhG: Fix for issue 1141: render objects in OSBA decoder with room effect */
		#define NONBE_FIX_981_PARAMBIN_DEFAULT_EARLY_PART /* Nokia: Set default early part energy correction to unity for BINAURAL_ROOM_REVERB */


		#define NONE_BE_FIX_816_LFE_PLC_FLOAT /* DLB: issue 816: reduce required precision to float for LFE-PLC*/

lib_enc/ivas_stereo_dft_enc.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -3297,7 +3297,7 @@ static float stereo_dft_calc_mean_ipd_change(
		ipd_mean_change /= gipd_band_max;

		#ifdef DEBUG_MODE_DFT
		dbgwrite( ipd_change, sizeof( float ), hStereoDft->gipd_band_max, 1, "res/stereo_dft_ipd_change.pcm" );
		dbgwrite( ipd_change, sizeof( float ), gipd_band_max, 1, "res/stereo_dft_ipd_change.pcm" );
		dbgwrite( &ipd_mean_change, sizeof( float ), 1, 1, "res/stereo_dft_ipd_mean_change.pcm" );
		#endif