Merge branch 'main' into update-basop-ci-branch (b117d9cd) · Commits · IVAS Codec Public Collaboration / IVAS Codec

.gitlab-ci.yml

+69 −24

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

		complexity-ism-in-binaural_room_ir-out:
		complexity-ism-in-binaural_room_reverb-out:
		extends:
		- .complexity-template
		rules:
		- if: $MEASURE_COMPLEXITY_LINUX
		# when: delayed
		# start_in: 1 hour
		when: delayed
		start_in: 1 hour
		script:
		- in_format=ISM
		- out_format=BINAURAL_ROOM_IR
		- out_format=BINAURAL_ROOM_REVERB
		- 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
		@@ -2317,8 +2317,8 @@ complexity-ism-in-ext-out:
		- .complexity-template
		rules:
		- if: $MEASURE_COMPLEXITY_LINUX
		# when: delayed
		# start_in: 2 hour
		when: delayed
		start_in: 3 hour
		script:
		- in_format=ISM
		- out_format=EXT
		@@ -2332,8 +2332,8 @@ complexity-sba-hoa3-in-ext-out:
		- .complexity-template
		rules:
		- if: $MEASURE_COMPLEXITY_LINUX
		# when: delayed
		# start_in: 3 hours
		when: delayed
		start_in: 4 hours
		script:
		- in_format=HOA3
		- out_format=EXT
		@@ -2347,8 +2347,8 @@ complexity-sba-hoa3-in-binaural_room_ir-out:
		- .complexity-template
		rules:
		- if: $MEASURE_COMPLEXITY_LINUX
		# when: delayed
		# start_in: 4 hours
		when: delayed
		start_in: 5 hours
		script:
		- in_format=HOA3
		- out_format=BINAURAL_ROOM_IR
		@@ -2362,8 +2362,8 @@ complexity-mc-in-ext-out:
		- .complexity-template
		rules:
		- if: $MEASURE_COMPLEXITY_LINUX
		# when: delayed
		# start_in: 5 hours
		when: delayed
		start_in: 6 hours
		script:
		- in_format=MC
		- out_format=EXT
		@@ -2377,8 +2377,8 @@ complexity-mc-in-binaural_room_ir-out:
		- .complexity-template
		rules:
		- if: $MEASURE_COMPLEXITY_LINUX
		# when: delayed
		# start_in: 6 hours
		when: delayed
		start_in: 7 hours
		script:
		- in_format=MC
		- out_format=BINAURAL_ROOM_IR
		@@ -2392,8 +2392,8 @@ complexity-masa-in-ext-out:
		- .complexity-template
		rules:
		- if: $MEASURE_COMPLEXITY_LINUX
		# when: delayed
		# start_in: 7 hours
		when: delayed
		start_in: 8 hours
		script:
		- in_format=MASA
		- out_format=EXT
		@@ -2407,8 +2407,8 @@ complexity-masa-in-binaural-out:
		- .complexity-template
		rules:
		- if: $MEASURE_COMPLEXITY_LINUX
		# when: delayed
		# start_in: 8 hours
		when: delayed
		start_in: 9 hours
		script:
		- in_format=MASA
		- out_format=BINAURAL
		@@ -2417,13 +2417,28 @@ complexity-masa-in-binaural-out:
		- *complexity-measurements-prepare-artifacts
		- exit $ret_val

		complexity-masa-in-hoa3-out:
		extends:
		- .complexity-template
		rules:
		- if: $MEASURE_COMPLEXITY_LINUX
		when: delayed
		start_in: 10 hours
		script:
		- in_format=MASA
		- 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-omasa-in-ext-out:
		extends:
		- .complexity-template
		rules:
		- if: $MEASURE_COMPLEXITY_LINUX
		# when: delayed
		# start_in: 9 hours
		when: delayed
		start_in: 11 hours
		script:
		- in_format=OMASA
		- out_format=EXT
		@@ -2437,8 +2452,8 @@ complexity-omasa-in-binaural-out:
		- .complexity-template
		rules:
		- if: $MEASURE_COMPLEXITY_LINUX
		# when: delayed
		# start_in: 10 hours
		when: delayed
		start_in: 12 hours
		script:
		- in_format=OMASA
		- out_format=BINAURAL
		@@ -2452,8 +2467,8 @@ complexity-StereoDmxEVS-stereo-in-mono-out:
		- .complexity-template
		rules:
		- if: $MEASURE_COMPLEXITY_LINUX
		# when: delayed
		# start_in: 11 hours
		when: delayed
		start_in: 13 hours
		script:
		- in_format=StereoDmxEVS
		- out_format=mono
		@@ -2462,6 +2477,36 @@ complexity-StereoDmxEVS-stereo-in-mono-out:
		- *complexity-measurements-prepare-artifacts
		- exit $ret_val

		complexity-osba-in-ext-out:
		extends:
		- .complexity-template
		rules:
		- if: $MEASURE_COMPLEXITY_LINUX
		when: delayed
		start_in: 14 hours
		script:
		- in_format=OSBA
		- out_format=EXT
		- 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
		script:
		- in_format=OSBA
		- out_format=BINAURAL_ROOM_IR
		- ret_val=0
		- bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" \|\| ret_val=$?
		- *complexity-measurements-prepare-artifacts
		- exit $ret_val

		# ---------------------------------------------------------------
		# Other jobs
		# ---------------------------------------------------------------

CMakeLists.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -174,7 +174,7 @@ target_include_directories(lib_util PUBLIC lib_util PRIVATE lib_com lib_enc lib_
		target_include_directories(lib_util PRIVATE lib_lc3plus lib_isar)

		if(NOT WMOPS)
		add_executable(ivas_lc3plus_unit_test ${CMAKE_SOURCE_DIR}/scripts/split_rendering/lc3plus/ivas_lc3plus_unit_test.c)
		add_executable(ivas_lc3plus_unit_test scripts/split_rendering/lc3plus/ivas_lc3plus_unit_test.c)
		target_link_libraries(ivas_lc3plus_unit_test lib_rend lib_dec lib_util lib_com lib_debug lib_isar)
		endif()

ci/setup_pages.py

+14 −9

Original line number	Diff line number	Diff line
		@@ -14,14 +14,14 @@ PROJECT_ID_BASOP_REPO = 77
		# job names -> hyperlink strings for the landing page
		JOBS_FLOAT_REPO = {
		# old ones no longer running -> replaced by "ext" jobs, remove after some time
		"complexity-stereo-in-stereo-out": "[OLD] Stereo in, stereo out",
		"complexity-ism-in-binaural-out": "[OLD] ISM in, BINAURAL out",
		"complexity-sba-hoa3-in-hoa3-out": "[OLD] HOA3 in, HOA3 out",
		"complexity-mc-in-7_1_4-out": "[OLD] MC in, 7_1_4 out",
		"complexity-masa-in-7_1_4-out": "[OLD] Masa in, 7_1_4 out",
		# "complexity-stereo-in-stereo-out": "[OLD] Stereo in, stereo out",
		# "complexity-sba-hoa3-in-hoa3-out": "[OLD] HOA3 in, HOA3 out",
		# "complexity-mc-in-7_1_4-out": "[OLD] MC in, 7_1_4 out",
		# "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_ir-out": "ISM in, BINAURAL_ROOM_IR 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-ext-out": "ISM in, EXT out",
		"complexity-sba-hoa3-in-ext-out": "HOA3 in, EXT out",
		"complexity-sba-hoa3-in-binaural_room_ir-out": "HOA3 in, BINAURAL_ROOM_IR out",
		@@ -29,10 +29,13 @@ JOBS_FLOAT_REPO = {
		"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",
		# "timeless" jobs (survivors from the old jobs or not complexity)
		"complexity-osba-in-ext-out": "OSBA in, EXT 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)
		"coverage-test-on-main-scheduled": "Coverage",
		}
		JOBS_BASOP_REPO = [
		@@ -79,6 +82,7 @@ def create_landing_page_float_repo(jobs, index_html):
		# dynamically create the complexity links on the landing page
		link_html = list()
		link_html = ["<ul>"]

		for job, link_text in jobs.items():
		if job.startswith("complexity"):
		line = f'<li><a href="{job}-public/index.html">{link_text}</a></li>'
		@@ -89,9 +93,10 @@ def create_landing_page_float_repo(jobs, index_html):
		index_pages_tmpl_path = (
		pathlib.Path(__file__).parent.joinpath("index-pages.html").absolute()
		)

		with open(index_pages_tmpl_path) as f:
		index_pages_tmpl = f.read()
		print(index_pages_tmpl)

		index_pages_tmpl = index_pages_tmpl.format(link_html_text)

		with open(index_html, "w") as f:

lib_com/ivas_cnst.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -1530,6 +1530,9 @@ typedef enum
		#define MAX_ANGULAR_STEP_INV ( 1.0f / MAX_ANGULAR_STEP )
		#define MAX_INTERPOLATION_STEPS 12

		#define RESAMPLE_FACTOR_16_48 ( 16.0f / 48.0f )
		#define RESAMPLE_FACTOR_32_48 ( 32.0f / 48.0f )

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

		typedef enum

lib_com/options.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -170,6 +170,7 @@
		#define FIX_1123_TDREN_16BIT_ROM
		#define FIX_1123_FASTCONV_16BIT_ROM /* FhG: issue 1123: update FastConv ROM tables and scripts to generate 16 bit tables instead of float */
		#define FIX_1123_PARAMBIN_16BIT_ROM /* FhG,Nok: issue 1123: update ParamBin ROM tables and scripts to generate 16 bit tables instead of float */
		#define FIX_RETURN /* VA: fix location of function returns */
		#endif
		#define FIX_BASOP_812_NAN_COHSNR /* FhG: BASOP issue 812: fix nan values in sparse frames for cohSNR value in ITD estimation*/