Merge branch 'main' into basop-ci/add-encoder-logging (5ae6e2b5) · Commits · IVAS Codec Public Collaboration / IVAS Codec

.gitlab-ci.yml

+142 −22

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

		complexity-ism-in-binaural-out:
		extends:
		- .complexity-template
		rules:
		- if: $MEASURE_COMPLEXITY_LINUX
		when: delayed
		start_in: 1 hour
		script:
		- in_format=ISM
		- 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: 1 hour
		when: delayed
		start_in: 2 hours
		script:
		- in_format=ISM
		- out_format=BINAURAL_ROOM_IR
		@@ -2317,8 +2332,8 @@ complexity-ism-in-ext-out:
		- .complexity-template
		rules:
		- if: $MEASURE_COMPLEXITY_LINUX
		# when: delayed
		# start_in: 2 hour
		when: delayed
		start_in: 3 hours
		script:
		- in_format=ISM
		- out_format=EXT
		@@ -2332,8 +2347,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
		@@ -2342,13 +2357,28 @@ complexity-sba-hoa3-in-ext-out:
		- *complexity-measurements-prepare-artifacts
		- exit $ret_val

		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: 4 hours
		when: delayed
		start_in: 6 hours
		script:
		- in_format=HOA3
		- out_format=BINAURAL_ROOM_IR
		@@ -2362,8 +2392,8 @@ complexity-mc-in-ext-out:
		- .complexity-template
		rules:
		- if: $MEASURE_COMPLEXITY_LINUX
		# when: delayed
		# start_in: 5 hours
		when: delayed
		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: 6 hours
		when: delayed
		start_in: 9 hours
		script:
		- in_format=MC
		- out_format=BINAURAL_ROOM_IR
		@@ -2392,8 +2437,8 @@ complexity-masa-in-ext-out:
		- .complexity-template
		rules:
		- if: $MEASURE_COMPLEXITY_LINUX
		# when: delayed
		# start_in: 7 hours
		when: delayed
		start_in: 10 hours
		script:
		- in_format=MASA
		- out_format=EXT
		@@ -2407,8 +2452,8 @@ complexity-masa-in-binaural-out:
		- .complexity-template
		rules:
		- if: $MEASURE_COMPLEXITY_LINUX
		# when: delayed
		# start_in: 8 hours
		when: delayed
		start_in: 11 hours
		script:
		- in_format=MASA
		- out_format=BINAURAL
		@@ -2417,13 +2462,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: 12 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: 13 hours
		script:
		- in_format=OMASA
		- out_format=EXT
		@@ -2437,8 +2497,8 @@ complexity-omasa-in-binaural-out:
		- .complexity-template
		rules:
		- if: $MEASURE_COMPLEXITY_LINUX
		# when: delayed
		# start_in: 10 hours
		when: delayed
		start_in: 14 hours
		script:
		- in_format=OMASA
		- out_format=BINAURAL
		@@ -2447,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: 11 hours
		when: delayed
		start_in: 16 hours
		script:
		- in_format=StereoDmxEVS
		- out_format=mono
		@@ -2462,6 +2537,51 @@ 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: 17 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-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: 19 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/complexity_measurements/getWmops.sh

+23 −4

Original line number	Diff line number	Diff line
		@@ -28,15 +28,27 @@
		# accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
		# the United Nations Convention on Contracts on the International Sales of Goods.

		# get format from command line
		if [ $# -ne 2 ]; then
		echo "Usage: $0 \"ivas-format(s)\" \"output-format(s)\""
		function usage {
		echo "Usage: $0 \"ivas-format(s)\" \"output-format(s)\" \"mode{full(default)\|mem_only}\""
		exit 1
		}

		if [ $# -ne 2 ] && [ $# -ne 3 ]; then
		usage
		fi

		ivas_format=$1
		output_format="$2"

		mode_arg_script=""
		if [ $# -eq 3 ]; then
		if [ "$3" = "mem_only" ]; then
		mode_arg_script="--wmc_tool_mem_only"
		elif [ "$3" != "full" ]; then
		usage
		fi
		fi

		date=`date +%Y%m%d` # used for log-file file ending
		shortDate=`date "+%b %d" \| sed -e "s/\ /_/g"` # stored in the log-file
		fullDate=`date "+%c" \| sed -e "s/\ /_/g"` # stored in the log-file
		@@ -55,8 +67,15 @@ wmopsFilenameFlc=${destDir}/wmops/logs/${wmopsFilenameFlcLast}

		ret_val=0

		mode_arg=""
		# for OSBA, there are just too many modes... -> only select HOA3 ones
		if [ "$ivas_format" == "OSBA" ]; then
		osba_hoa3_modes=$(./scripts/runIvasCodec.py -C OSBA -l \| grep "HOA3")
		mode_arg="-m $osba_hoa3_modes"
		fi

		# instrument and build
		./scripts/IvasBuildAndRunChecks.py -p $config_file --checks COMPLEXITY --create_complexity_tables ${wmopsFilenameFlc} -C $ivas_format -f ${ep} --oc $output_format
		./scripts/IvasBuildAndRunChecks.py $mode_arg_script -p $config_file --checks COMPLEXITY --create_complexity_tables ${wmopsFilenameFlc} -C $ivas_format $mode_arg -f ${ep} --oc $output_format
		ret_val=$?

		# get the info on worst-case operating point: WMOPS number, enc-operating mode, dec-operating mode

ci/setup_pages.py

+17 −8

Original line number	Diff line number	Diff line
		@@ -14,25 +14,32 @@ 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-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",
		# "timeless" jobs (survivors from the old jobs or not complexity)
		"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)
		"coverage-test-on-main-scheduled": "Coverage",
		}
		JOBS_BASOP_REPO = [
		@@ -79,6 +86,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 +97,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/cnst.h

+4 −0

Original line number	Diff line number	Diff line
		@@ -563,6 +563,10 @@ enum

		#define INT_FS_12k8 12800 /* internal sampling frequency */
		#define M 16 /* order of the LP filter @ 12.8kHz */
		#ifdef NONE_BE_FIX_816_LFE_PLC_FLOAT
		#define MAX_LP_FILTER_ORDER 20 /* Max order of an LP filter */
		#endif

		#define L_FRAME 256 /* frame size at 12.8kHz */
		#define NB_SUBFR 4 /* number of subframes per frame */
		#define L_SUBFR ( L_FRAME / NB_SUBFR ) /* subframe size */