From 5d8360a55a2e085483e1ea96a1373b41232d5e1f Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Thu, 7 Nov 2024 17:24:02 +0100 Subject: [PATCH 1/2] exclude planar modes from OSBA complexity run --- ci/complexity_measurements/getWmops.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/complexity_measurements/getWmops.sh b/ci/complexity_measurements/getWmops.sh index 23de0b2147..3289a91c34 100755 --- a/ci/complexity_measurements/getWmops.sh +++ b/ci/complexity_measurements/getWmops.sh @@ -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 -- GitLab From c133ce80268e6c9f84a821973424624d8811b9d0 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Thu, 7 Nov 2024 17:36:20 +0100 Subject: [PATCH 2/2] fix table name for OSBA planar modes --- scripts/config/ivas_modes.json | 48 +++++++++++++++++----------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/scripts/config/ivas_modes.json b/scripts/config/ivas_modes.json index 1ba3983536..05e49d687d 100644 --- a/scripts/config/ivas_modes.json +++ b/scripts/config/ivas_modes.json @@ -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" -- GitLab