Merge branch 'main' into ci/check-compatibility-with-float-reference-branch (e4aaf70c) · Commits · IVAS Codec Public Collaboration / IVAS Codec

.gitlab-ci.yml

+89 −14

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

		complexity-ism-in-binaural_room_reverb-out:
		complexity-ism-in-binaural-out:
		extends:
		- .complexity-template
		rules:
		@@ -2359,7 +2359,22 @@ complexity-ism-in-binaural_room_reverb-out:
		start_in: 1 hour
		script:
		- in_format=ISM
		- out_format=BINAURAL_ROOM_REVERB
		- 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: 2 hours
		script:
		- in_format=ISM
		- out_format=BINAURAL_ROOM_IR
		- 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
		@@ -2371,7 +2386,7 @@ complexity-ism-in-ext-out:
		rules:
		- if: $MEASURE_COMPLEXITY_LINUX
		when: delayed
		start_in: 3 hour
		start_in: 3 hours
		script:
		- in_format=ISM
		- out_format=EXT
		@@ -2395,13 +2410,28 @@ complexity-sba-hoa3-in-ext-out:
		- *complexity-measurements-prepare-artifacts
		- exit $ret_val

		complexity-sba-hoa3-in-binaural_room_ir-out:
		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: 6 hours
		script:
		- in_format=HOA3
		- out_format=BINAURAL_ROOM_IR
		@@ -2416,7 +2446,7 @@ complexity-mc-in-ext-out:
		rules:
		- if: $MEASURE_COMPLEXITY_LINUX
		when: delayed
		start_in: 6 hours
		start_in: 7 hours
		script:
		- in_format=MC
		- out_format=EXT
		@@ -2425,13 +2455,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: 7 hours
		start_in: 9 hours
		script:
		- in_format=MC
		- out_format=BINAURAL_ROOM_IR
		@@ -2446,7 +2491,7 @@ complexity-masa-in-ext-out:
		rules:
		- if: $MEASURE_COMPLEXITY_LINUX
		when: delayed
		start_in: 8 hours
		start_in: 10 hours
		script:
		- in_format=MASA
		- out_format=EXT
		@@ -2461,7 +2506,7 @@ complexity-masa-in-binaural-out:
		rules:
		- if: $MEASURE_COMPLEXITY_LINUX
		when: delayed
		start_in: 9 hours
		start_in: 11 hours
		script:
		- in_format=MASA
		- out_format=BINAURAL
		@@ -2476,7 +2521,7 @@ complexity-masa-in-hoa3-out:
		rules:
		- if: $MEASURE_COMPLEXITY_LINUX
		when: delayed
		start_in: 10 hours
		start_in: 12 hours
		script:
		- in_format=MASA
		- out_format=HOA3
		@@ -2491,7 +2536,7 @@ complexity-omasa-in-ext-out:
		rules:
		- if: $MEASURE_COMPLEXITY_LINUX
		when: delayed
		start_in: 11 hours
		start_in: 13 hours
		script:
		- in_format=OMASA
		- out_format=EXT
		@@ -2506,7 +2551,7 @@ complexity-omasa-in-binaural-out:
		rules:
		- if: $MEASURE_COMPLEXITY_LINUX
		when: delayed
		start_in: 12 hours
		start_in: 14 hours
		script:
		- in_format=OMASA
		- out_format=BINAURAL
		@@ -2515,13 +2560,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: 13 hours
		start_in: 16 hours
		script:
		- in_format=StereoDmxEVS
		- out_format=mono
		@@ -2536,7 +2596,7 @@ complexity-osba-in-ext-out:
		rules:
		- if: $MEASURE_COMPLEXITY_LINUX
		when: delayed
		start_in: 14 hours
		start_in: 17 hours
		script:
		- in_format=OSBA
		- out_format=EXT
		@@ -2545,13 +2605,28 @@ complexity-osba-in-ext-out:
		- *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: 15 hours
		start_in: 19 hours
		script:
		- in_format=OSBA
		- out_format=BINAURAL_ROOM_IR

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

+5 −1

Original line number	Diff line number	Diff line
		@@ -20,19 +20,23 @@ JOBS_FLOAT_REPO = {
		# "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_reverb-out": "ISM in, BINAURAL_ROOM_REVERB 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",
		"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)

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 */

lib_com/ivas_cnst.h

+4 −0

Original line number	Diff line number	Diff line
		@@ -1444,7 +1444,11 @@ typedef enum
		/* LFE PLC */
		#define LFE_PLC_BUFLEN 240
		#define LFE_PLC_FS 1600
		#ifdef NONE_BE_FIX_816_LFE_PLC_FLOAT
		#define L_FRAME_1k6 ( LFE_PLC_FS / FRAMES_PER_SEC )
		#else
		#define L_FRAME_1k6 ( 20 * LFE_PLC_FS / 1000 )
		#endif
		#define LFE_PLC_LENANA LFE_PLC_BUFLEN
		#define LFE_PLC_FDEL 300