Merge remote-tracking branch 'origin/main' into 222-logs-in-sanitizer-jobs-do-not-get-collected (e4f7d5da) · Commits · IVAS Codec Public Collaboration / IVAS Codec

.gitlab-ci.yml

+7 −4

Original line number	Diff line number	Diff line
		@@ -331,7 +331,7 @@ external-renderer-make-pytest:
		- make -j IVAS_rend
		- make -j unittests
		- make -j --directory scripts/td_object_renderer/object_renderer_standalone
		- python3 -m pytest -q --log-level ERROR -n auto -rA --junit-xml=report-junit.xml tests/renderer/test_renderer.py
		- python3 -m pytest -q -n auto -rA --junit-xml=report-junit.xml tests/renderer/test_renderer.py
		artifacts:
		name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--job-$CI_JOB_NAME--results"
		when: always
		@@ -353,7 +353,8 @@ external-renderer-cmake-asan-pytest:
		- python3 ci/disable_ram_counting.py
		- cmake -B cmake-build -G "Unix Makefiles" -DCLANG=asan -DCOPY_EXECUTABLES_FROM_BUILD_DIR=true
		- cmake --build cmake-build -- -j
		- python3 -m pytest -q --log-level ERROR -n auto -rA --junit-xml=report-junit.xml tests/renderer/test_renderer.py
		- python3 -m pytest -q -n auto -rA --junit-xml=report-junit.xml tests/renderer/test_renderer.py

		artifacts:
		name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--job-$CI_JOB_NAME--results"
		when: always
		@@ -375,7 +376,8 @@ external-renderer-cmake-msan-pytest:
		- python3 ci/disable_ram_counting.py
		- cmake -B cmake-build -G "Unix Makefiles" -DCLANG=msan -DCOPY_EXECUTABLES_FROM_BUILD_DIR=true
		- cmake --build cmake-build -- -j
		- python3 -m pytest -q --log-level ERROR -n auto -rA --junit-xml=report-junit.xml tests/renderer/test_renderer.py
		- python3 -m pytest -q -n auto -rA --junit-xml=report-junit.xml tests/renderer/test_renderer.py

		artifacts:
		name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--job-$CI_JOB_NAME--results"
		when: always
		@@ -397,7 +399,7 @@ external-renderer-cmake-msan-pytest:
		script:
		- cmake -B cmake-build -G "Unix Makefiles" -DCOPY_EXECUTABLES_FROM_BUILD_DIR=true -DDEC_TO_REND_FLOAT_DUMP=true
		- cmake --build cmake-build -- -j
		- python3 -m pytest -q --log-level ERROR -n 1 -rA --junit-xml=report-junit.xml tests/renderer/test_renderer_vs_decoder.py
		- python3 -m pytest -q -n 1 -rA --junit-xml=report-junit.xml tests/renderer/test_renderer_vs_decoder.py
		artifacts:
		name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--job-$CI_JOB_NAME--results"
		when: always
		@@ -963,6 +965,7 @@ coverage-test-on-main-scheduled:
		- sed -i "s/IVAS FORMAT/IVAS $in_format to $out_format/g" ${public_dir}/index.html
		# do separately here to avoid overwrite complaints by mv
		- mv -f ci/complexity_measurements/style.css ${public_dir}/
		- ls $public_dir

		.complexity-template:
		extends:

apps/decoder.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -79,7 +79,6 @@ static
		#define NUM_BITS_SID_IVAS_9K3 186
		#define NUM_BITS_SID_IVAS_10K2 204
		#endif
		#define META_LINE_LENGTH 200
		#define MAX_FRAME_SIZE ( 48000 / 50 )
		#define MAX_NUM_OUTPUT_CHANNELS 16
		#define MAX_OUTPUT_PCM_BUFFER_SIZE ( MAX_NUM_OUTPUT_CHANNELS * MAX_FRAME_SIZE )

ci/collect_artifacts.py

+3 −0

Original line number	Diff line number	Diff line
		@@ -65,6 +65,9 @@ def collect_for_sanitizer_test(file):
		)
		files_to_archive = find_failed_files_for_sanitizer_test(console_log, "logs")

		print("files_to_archive_noPLC:", files_to_archive_noPLC)
		print("files_to_archive:", files_to_archive)

		log_folder = pathlib.Path("./LOGS_PLC")
		log_folder.mkdir()
		for test in files_to_archive.keys():

lib_com/delay_comp.c

+11 −3

Original line number	Diff line number	Diff line
		@@ -50,8 +50,12 @@
		--------------------------------------------------------------------------/

		/! r: delay value in ns /
		#ifdef FIX_GET_DELAY_RETURN
		int32_t get_delay(
		#else
		float get_delay(
		const int16_t what_delay, /* i : what delay? (ENC or DEC) */
		#endif
		const int16_t enc_dec, /* i : encoder/decoder flag */
		const int32_t io_fs, /* i : input/output sampling frequency */
		const IVAS_FORMAT ivas_format, /* i : IVAS format */
		HANDLE_CLDFB_FILTER_BANK hCldfb, /* i : Handle of Cldfb analysis */
		@@ -59,9 +63,13 @@ float get_delay(
		const int32_t binaural_latency_ns /* i : binaural renderer HRTF delay in ns */
		)
		{
		#ifdef FIX_GET_DELAY_RETURN
		int32_t delay = 0;
		#else
		float delay = 0;
		#endif

		if ( what_delay == ENC )
		if ( enc_dec == ENC )
		{
		if ( ivas_format == MONO_FORMAT ) /* EVS mono */
		{
		@@ -78,7 +86,7 @@ float get_delay(
		delay += IVAS_FB_ENC_DELAY_NS;
		}
		}
		else
		else /* DEC */
		{
		if ( ivas_format == MONO_FORMAT ) /* EVS mono */
		{

lib_com/ivas_cnst.h

+12 −3

Original line number	Diff line number	Diff line
		@@ -303,8 +303,6 @@ typedef enum
		* ISm Constants
		----------------------------------------------------------------------------------/

		#define META_LINE_LENGTH 200 /* max number of characters at one line of metadata input/output file */

		#define ISM_NB_BITS_METADATA_NOMINAL ( ( SCE_CORE_16k_LOW_LIMIT - ACELP_16k_LOW_LIMIT ) / FRAMES_PER_SEC ) /* nominal number of metadata bits - used for configuration of Core-Coder modules */

		#define ISM_METADATA_VAD_FLAG_BITS 1
		@@ -1390,8 +1388,19 @@ typedef enum
		#define SFX_SPAT_BIN_MAX_FILTER_LENGTH 256

		#define SPAT_BIN_MAX_INPUT_CHANNELS 1 /* Max number of input channels per source/object. Mono for now, but stereo objects may be considered. */

		#ifdef FIX_ITD
		#define MAX_ITD 50
		#define SFX_SPAT_BIN_SINC_M 5
		#define SFX_SPAT_BIN_NUM_SUBSAMPLES 64
		#define ITD_MEM_LEN (MAX_ITD + SFX_SPAT_BIN_SINC_M)
		#define L_SUBFRAME5MS_48k (L_FRAME48k/4)
		#define MAX_ANGULAR_STEP (15.0f)
		#define MAX_ANGULAR_STEP_INV ( 1.0f / MAX_ANGULAR_STEP )
		#define MAX_INTERPOLATION_STEPS 12
		#define BINAURAL_TD_LATENCY_S 0.0f /* ITD fix removes TD renderer delay -- should be cleaned out */
		#else
		#define BINAURAL_TD_LATENCY_S 0.00675f /* Binaural TD renderer latency in second == 324 samples in between 333 and 315 */
		#endif

		/* ----- Enums - TD Renderer ----- */