- Merge branch 'main' of https://forge.3gpp.org/rep/ivas-codec-pc/ivas-codec (8335d48c) · 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()

apps/encoder.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -15,6 +15,7 @@
		the software. This notice grants no license of any kind, including but not limited to patent
		license, nor is any license granted by implication, estoppel or otherwise.

		Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
		Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
		contributions.

ci/basop-pages/create_report_pages.py

+10 −3

Original line number	Diff line number	Diff line
		@@ -198,10 +198,12 @@ def tr_from_row(row, id_current, id_previous):
		try:
		if float(curr) > float(prev):
		curr += f" {ARROW_UP}"
		td_tmpl_curr = TD_TMPL_INCREASE
		# increase is bad -> mark in red, execpt for SNR for which it is good -> mark in green
		td_tmpl_curr = TD_TMPL_REDUCE if c == "MIN_SSNR" else TD_TMPL_INCREASE
		elif float(curr) < float(prev):
		curr += f" {ARROW_DOWN}"
		td_tmpl_curr = TD_TMPL_REDUCE
		# reduce is good -> mark in green, execpt for SNR for which it is bad -> mark in red
		td_tmpl_curr = TD_TMPL_INCREASE if c == "MIN_SSNR" else TD_TMPL_REDUCE
		except ValueError:
		# if we land here, one of the cells is not a number, this indicates a crash
		# or some error in the scripts, so mark with red as well
		@@ -258,7 +260,12 @@ def merge_and_cleanup_mld_reports(
		for col_pair in other_col_pairs:
		col_prev = col_pair[0]
		col_curr = col_pair[1]

		try:
		diff_other += abs(float(x[col_curr]) - float(x[col_prev]))
		except ValueError:
		# can't make float from the column contents, probably NONE -> put to top
		diff_other += float("inf")

		if diff_other > 0:
		diff = -1000000

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