Merge branch 'main' into 114-bitrate-switching-in-sba-reinit-reconfig (4bed2c5c) · 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
		@@ -62,6 +62,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():

ci/run_scheduled_sanitizer_test.py

+9 −5

Original line number	Diff line number	Diff line
		@@ -115,7 +115,7 @@ def run_check(modes: list, out_formats: list, tests: list, run_fec: bool = True)
		)
		)

		with open(CONSOLE_OUT_FILE, "a") as f:
		with open(CONSOLE_OUT_FILE, "w") as f:
		proc = subprocess.Popen(
		cmd_no_fec, stdout=subprocess.PIPE, stderr=subprocess.PIPE
		)
		@@ -174,9 +174,13 @@ def run_check(modes: list, out_formats: list, tests: list, run_fec: bool = True)
		)
		)

		proc = subprocess.Popen(cmd_fec, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
		with open(CONSOLE_OUT_FILE, "a") as f:
		proc = subprocess.Popen(
		cmd_fec, stdout=subprocess.PIPE, stderr=subprocess.PIPE
		)
		for c in iter(lambda: proc.stdout.read(1), b""):
		sys.stdout.buffer.write(c)
		f.write(c.decode("utf8"))
		proc.wait()

		returncode_fec = proc.returncode

lib_com/bitstream.c

+9 −1

Original line number	Diff line number	Diff line
		@@ -1950,6 +1950,14 @@ ivas_error preview_indices(
		/* read number of objects from the bitstream */
		st_ivas->nchan_transport = 1;

		#ifdef FIX_ISM_DECODER_PRINTOUT
		k = (int16_t) ( ( total_brate / FRAMES_PER_SEC ) - 1 );
		while ( bit_stream[k] == 1 && st_ivas->nchan_transport < MAX_NUM_OBJECTS )
		{
		st_ivas->nchan_transport++;
		k--;
		}
		#else
		if ( total_brate != SID_2k40 && total_brate != FRAME_NO_DATA )
		{
		k = (int16_t) ( ( total_brate / FRAMES_PER_SEC ) - 1 );
		@@ -1959,7 +1967,7 @@ ivas_error preview_indices(
		k--;
		}
		}

		#endif
		st_ivas->transport_config = AUDIO_CONFIG_EXTERNAL + st_ivas->nchan_transport;

		st_ivas->ism_mode = ivas_ism_mode_select( st_ivas->nchan_transport, total_brate );