Merge branch 'ci/fix-duplication-in-osba-compelxity' into 'main' (f7ec6848) · Commits · IVAS Codec Public Collaboration / IVAS Codec

ci/complexity_measurements/getWmops.sh

+1 −1

Original line number	Diff line number	Diff line
		@@ -80,7 +80,7 @@ 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")
		osba_hoa3_modes=$(./scripts/runIvasCodec.py -C OSBA -l \| grep "HOA3" \| grep -v "planar")
		mode_arg="-m $osba_hoa3_modes"
		fi

scripts/config/ivas_modes.json

+24 −24

Original line number	Diff line number	Diff line
		@@ -7623,7 +7623,7 @@
		"EXT": []
		},
		"in_config": "OSBA_ISM1_HOA3",
		"table_name": "OSBA ISM1 HOA3@{table_bitrate} kbps {bandwidth}",
		"table_name": "OSBA ISM1 Planar HOA3@{table_bitrate} kbps {bandwidth}",
		"nummetadata": 1,
		"metadatafilenames": [
		"stvISM{mdi}.csv"
		@@ -7706,7 +7706,7 @@
		"EXT": []
		},
		"in_config": "OSBA_ISM1_HOA2",
		"table_name": "OSBA ISM1 HOA2@{table_bitrate} kbps {bandwidth}",
		"table_name": "OSBA ISM1 Planar HOA2@{table_bitrate} kbps {bandwidth}",
		"nummetadata": 1,
		"metadatafilenames": [
		"stvISM{mdi}.csv"
		@@ -7789,7 +7789,7 @@
		"EXT": []
		},
		"in_config": "OSBA_ISM1_FOA",
		"table_name": "OSBA ISM1 FOA@{table_bitrate} kbps {bandwidth}",
		"table_name": "OSBA ISM1 Planar FOA@{table_bitrate} kbps {bandwidth}",
		"nummetadata": 1,
		"metadatafilenames": [
		"stvISM{mdi}.csv"
		@@ -7872,7 +7872,7 @@
		"EXT": []
		},
		"in_config": "OSBA_ISM2_HOA3",
		"table_name": "OSBA ISM2 HOA3@{table_bitrate} kbps {bandwidth}",
		"table_name": "OSBA ISM2 Planar HOA3@{table_bitrate} kbps {bandwidth}",
		"nummetadata": 2,
		"metadatafilenames": [
		"stvISM{mdi}.csv"
		@@ -7955,7 +7955,7 @@
		"EXT": []
		},
		"in_config": "OSBA_ISM2_HOA2",
		"table_name": "OSBA ISM2 HOA2@{table_bitrate} kbps {bandwidth}",
		"table_name": "OSBA ISM2 Planar HOA2@{table_bitrate} kbps {bandwidth}",
		"nummetadata": 2,
		"metadatafilenames": [
		"stvISM{mdi}.csv"
		@@ -8038,7 +8038,7 @@
		"EXT": []
		},
		"in_config": "OSBA_ISM2_FOA",
		"table_name": "OSBA ISM2 FOA@{table_bitrate} kbps {bandwidth}",
		"table_name": "OSBA ISM2 Planar FOA@{table_bitrate} kbps {bandwidth}",
		"nummetadata": 2,
		"metadatafilenames": [
		"stvISM{mdi}.csv"
		@@ -8121,7 +8121,7 @@
		"EXT": []
		},
		"in_config": "OSBA_ISM3_HOA3",
		"table_name": "OSBA ISM3 HOA3@{table_bitrate} kbps {bandwidth}",
		"table_name": "OSBA ISM3 Planar HOA3@{table_bitrate} kbps {bandwidth}",
		"nummetadata": 3,
		"metadatafilenames": [
		"stvISM{mdi}.csv"
		@@ -8204,7 +8204,7 @@
		"EXT": []
		},
		"in_config": "OSBA_ISM3_HOA2",
		"table_name": "OSBA ISM3 HOA2@{table_bitrate} kbps {bandwidth}",
		"table_name": "OSBA ISM3 Planar HOA2@{table_bitrate} kbps {bandwidth}",
		"nummetadata": 3,
		"metadatafilenames": [
		"stvISM{mdi}.csv"
		@@ -8287,7 +8287,7 @@
		"EXT": []
		},
		"in_config": "OSBA_ISM3_FOA",
		"table_name": "OSBA ISM3 FOA@{table_bitrate} kbps {bandwidth}",
		"table_name": "OSBA ISM3 Planar FOA@{table_bitrate} kbps {bandwidth}",
		"nummetadata": 3,
		"metadatafilenames": [
		"stvISM{mdi}.csv"
		@@ -8370,7 +8370,7 @@
		"EXT": []
		},
		"in_config": "OSBA_ISM4_HOA3",
		"table_name": "OSBA ISM4 HOA3@{table_bitrate} kbps {bandwidth}",
		"table_name": "OSBA ISM4 Planar HOA3@{table_bitrate} kbps {bandwidth}",
		"nummetadata": 4,
		"metadatafilenames": [
		"stvISM{mdi}.csv"
		@@ -8453,7 +8453,7 @@
		"EXT": []
		},
		"in_config": "OSBA_ISM4_HOA2",
		"table_name": "OSBA ISM4 HOA2@{table_bitrate} kbps {bandwidth}",
		"table_name": "OSBA ISM4 Planar HOA2@{table_bitrate} kbps {bandwidth}",
		"nummetadata": 4,
		"metadatafilenames": [
		"stvISM{mdi}.csv"
		@@ -8536,7 +8536,7 @@
		"EXT": []
		},
		"in_config": "OSBA_ISM4_FOA",
		"table_name": "OSBA ISM4 FOA@{table_bitrate} kbps {bandwidth}",
		"table_name": "OSBA ISM4 Planar FOA@{table_bitrate} kbps {bandwidth}",
		"nummetadata": 4,
		"metadatafilenames": [
		"stvISM{mdi}.csv"
		@@ -8619,7 +8619,7 @@
		"EXT": []
		},
		"in_config": "OSBA_ISM1_HOA3",
		"table_name": "OSBA ISM1 HOA3 RS {bandwidth}",
		"table_name": "OSBA ISM1 Planar HOA3 RS {bandwidth}",
		"nummetadata": 1,
		"metadatafilenames": [
		"stvISM{mdi}.csv"
		@@ -8666,7 +8666,7 @@
		"EXT": []
		},
		"in_config": "OSBA_ISM1_HOA2",
		"table_name": "OSBA ISM1 HOA2 RS {bandwidth}",
		"table_name": "OSBA ISM1 Planar HOA2 RS {bandwidth}",
		"nummetadata": 1,
		"metadatafilenames": [
		"stvISM{mdi}.csv"
		@@ -8713,7 +8713,7 @@
		"EXT": []
		},
		"in_config": "OSBA_ISM1_FOA",
		"table_name": "OSBA ISM1 FOA RS {bandwidth}",
		"table_name": "OSBA ISM1 Planar FOA RS {bandwidth}",
		"nummetadata": 1,
		"metadatafilenames": [
		"stvISM{mdi}.csv"
		@@ -8760,7 +8760,7 @@
		"EXT": []
		},
		"in_config": "OSBA_ISM2_HOA3",
		"table_name": "OSBA ISM2 HOA RS {bandwidth}",
		"table_name": "OSBA ISM2 Planar HOA RS {bandwidth}",
		"nummetadata": 2,
		"metadatafilenames": [
		"stvISM{mdi}.csv"
		@@ -8807,7 +8807,7 @@
		"EXT": []
		},
		"in_config": "OSBA_ISM2_HOA2",
		"table_name": "OSBA ISM2 HOA2 RS {bandwidth}",
		"table_name": "OSBA ISM2 Planar HOA2 RS {bandwidth}",
		"nummetadata": 2,
		"metadatafilenames": [
		"stvISM{mdi}.csv"
		@@ -8854,7 +8854,7 @@
		"EXT": []
		},
		"in_config": "OSBA_ISM2_FOA",
		"table_name": "OSBA ISM2 FOA RS {bandwidth}",
		"table_name": "OSBA ISM2 Planar FOA RS {bandwidth}",
		"nummetadata": 2,
		"metadatafilenames": [
		"stvISM{mdi}.csv"
		@@ -8901,7 +8901,7 @@
		"EXT": []
		},
		"in_config": "OSBA_ISM3_HOA3",
		"table_name": "OSBA ISM3 HOA3 RS {bandwidth}",
		"table_name": "OSBA ISM3 Planar HOA3 RS {bandwidth}",
		"nummetadata": 3,
		"metadatafilenames": [
		"stvISM{mdi}.csv"
		@@ -8948,7 +8948,7 @@
		"EXT": []
		},
		"in_config": "OSBA_ISM3_HOA2",
		"table_name": "OSBA ISM3 HOA2 RS {bandwidth}",
		"table_name": "OSBA ISM3 Planar HOA2 RS {bandwidth}",
		"nummetadata": 3,
		"metadatafilenames": [
		"stvISM{mdi}.csv"
		@@ -8995,7 +8995,7 @@
		"EXT": []
		},
		"in_config": "OSBA_ISM3_FOA",
		"table_name": "OSBA ISM3 FOA RS {bandwidth}",
		"table_name": "OSBA ISM3 Planar FOA RS {bandwidth}",
		"nummetadata": 3,
		"metadatafilenames": [
		"stvISM{mdi}.csv"
		@@ -9042,7 +9042,7 @@
		"EXT": []
		},
		"in_config": "OSBA_ISM4_HOA3",
		"table_name": "OSBA ISM4 HOA3 RS {bandwidth}",
		"table_name": "OSBA ISM4 Planar HOA3 RS {bandwidth}",
		"nummetadata": 4,
		"metadatafilenames": [
		"stvISM{mdi}.csv"
		@@ -9089,7 +9089,7 @@
		"EXT": []
		},
		"in_config": "OSBA_ISM4_HOA2",
		"table_name": "OSBA ISM4 HOA2 RS {bandwidth}",
		"table_name": "OSBA ISM4 Planar HOA2 RS {bandwidth}",
		"nummetadata": 4,
		"metadatafilenames": [
		"stvISM{mdi}.csv"
		@@ -9136,7 +9136,7 @@
		"EXT": []
		},
		"in_config": "OSBA_ISM4_FOA",
		"table_name": "OSBA ISM4 FOA RS {bandwidth}",
		"table_name": "OSBA ISM4 Planar FOA RS {bandwidth}",
		"nummetadata": 4,
		"metadatafilenames": [
		"stvISM{mdi}.csv"