From e9efb892b162fba6f6460c736a62c84c0efb8697 Mon Sep 17 00:00:00 2001 From: det Date: Mon, 13 Jan 2025 12:00:06 +0100 Subject: [PATCH 01/12] patched MR1266 into basop. --- lib_com/options.h | 1 + lib_dec/ivas_jbm_dec.c | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/lib_com/options.h b/lib_com/options.h index a914c8e66..ecfe2d6ab 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -86,6 +86,7 @@ #define FIX_QMETADATA_PENALTY /* Nokia: transform penalty calculation in qmetadata into integer operations */ #define FIX_1013_CRASH_HQ_CORE_DEC /* Ittiam: Saturation added on the lines of EVS */ #define NONE_BE_FIX_BASOP_1044_OSBA_PRERENDER_MIX_GAINS /* DLB: adjust prerendering and mixing gain in OSBA encoder. This is fix to float codes*/ +#define NONBE_FIX_926_OSBA_DECODER_CRASH_PLANAR_SBA /* FhG: issue 926: crash in OSBA decoding with planar FOA */ #define NONBE_1233_HQ_CLASSIFIER_DIV_BY_ZERO /* Eri: issue 1233: Address possible division by zero in hf_spectrum_sparseness() */ #define FIX_ISSUE_1062_AND_1068_TON_ENE_EST_FX #define FIX_ISSUE_987 diff --git a/lib_dec/ivas_jbm_dec.c b/lib_dec/ivas_jbm_dec.c index d69fa8525..d4ac66dcf 100644 --- a/lib_dec/ivas_jbm_dec.c +++ b/lib_dec/ivas_jbm_dec.c @@ -3259,7 +3259,11 @@ Word16 ivas_jbm_dec_get_num_tc_channels_fx( test(); test(); +#ifdef NONBE_FIX_926_OSBA_DECODER_CRASH_PLANAR_SBA + if ( EQ_16( num_tc, 3 ) ) +#else if ( ( st_ivas->sba_planar && GE_16( num_tc, 3 ) ) || EQ_16( num_tc, 3 ) ) +#endif { num_tc = add( num_tc, 1 ); } -- GitLab From e5067a7b89c47c7ccdd35eb75a56293e721887a4 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Fri, 14 Mar 2025 13:47:59 +0100 Subject: [PATCH 02/12] move switch to correct section --- lib_com/options.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib_com/options.h b/lib_com/options.h index 348e4bc24..b2dd1e3e7 100755 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -79,7 +79,6 @@ #define FIX_QMETADATA_PENALTY /* Nokia: transform penalty calculation in qmetadata into integer operations */ #define FIX_1013_CRASH_HQ_CORE_DEC /* Ittiam: Saturation added on the lines of EVS */ #define NONE_BE_FIX_BASOP_1044_OSBA_PRERENDER_MIX_GAINS /* DLB: adjust prerendering and mixing gain in OSBA encoder. This is fix to float codes*/ -#define NONBE_FIX_926_OSBA_DECODER_CRASH_PLANAR_SBA /* FhG: issue 926: crash in OSBA decoding with planar FOA */ #define NONBE_1233_HQ_CLASSIFIER_DIV_BY_ZERO /* Eri: issue 1233: Address possible division by zero in hf_spectrum_sparseness() */ #define FIX_ISSUE_1062_AND_1068_TON_ENE_EST_FX #define FIX_ISSUE_987 @@ -184,7 +183,7 @@ #define NONBE_FIX_855_JBM_FLUSH_OFFSET /* FhG: issue #855: add missing switch here for the code in JBM flushing */ #define FIX_923_EXTERNAL_REND_COMMAND_LINE /* VA: issue 923: enable external renderer command-line options in UPPER case letters */ #define FIX_921_OMASA_DELAY_PRINTOUT /* VA: issue 921: correct OMASA decoder delay printout */ - +#define NONBE_FIX_926_OSBA_DECODER_CRASH_PLANAR_SBA /* FhG: issue 926: crash in OSBA decoding with planar FOA */ /* #################### End BASOP porting switches ############################ */ -- GitLab From 847c923ffd563692dad77bd8e0833ebd05dfef11 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Fri, 14 Mar 2025 13:57:29 +0100 Subject: [PATCH 03/12] add debug output in CI job --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c0a7d37b5..95f7c9959 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1062,6 +1062,7 @@ check-naming-of-branch-for-main-pc-merges: - ivas-basop-linux script: - *update-scripts-repo + - git branch --list - if [[ ! "$CI_MERGE_REQUEST_TITLE" =~ \[skip[[:space:]_-]name[[:space:]_-]check\] ]] && [[ ! "$CI_MERGE_REQUEST_TITLE" =~ \[CI\] ]]; then - git fetch - ci/get_float_ref_branch_name.sh $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME -- GitLab From a3a3f515ece52eeaa9184292fa8a68ac7e78b68f Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Fri, 14 Mar 2025 14:02:16 +0100 Subject: [PATCH 04/12] apply clang-format --- lib_dec/ivas_jbm_dec_fx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib_dec/ivas_jbm_dec_fx.c b/lib_dec/ivas_jbm_dec_fx.c index 8cee8c26d..95d9fb03e 100644 --- a/lib_dec/ivas_jbm_dec_fx.c +++ b/lib_dec/ivas_jbm_dec_fx.c @@ -3401,7 +3401,7 @@ Word16 ivas_jbm_dec_get_num_tc_channels_fx( test(); test(); -#ifdef NONBE_FIX_926_OSBA_DECODER_CRASH_PLANAR_SBA +#ifdef NONBE_FIX_926_OSBA_DECODER_CRASH_PLANAR_SBA if ( EQ_16( num_tc, 3 ) ) #else if ( ( st_ivas->sba_planar && GE_16( num_tc, 3 ) ) || EQ_16( num_tc, 3 ) ) -- GitLab From c796ec69f3dcbf2fe7604c1f48877359de1ffe65 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Fri, 14 Mar 2025 14:03:22 +0100 Subject: [PATCH 05/12] add further debug printout --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 95f7c9959..e6801b2c5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1065,6 +1065,7 @@ check-naming-of-branch-for-main-pc-merges: - git branch --list - if [[ ! "$CI_MERGE_REQUEST_TITLE" =~ \[skip[[:space:]_-]name[[:space:]_-]check\] ]] && [[ ! "$CI_MERGE_REQUEST_TITLE" =~ \[CI\] ]]; then - git fetch + - git branch --list - ci/get_float_ref_branch_name.sh $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME - fi -- GitLab From 4455a51b8bdc2180cca085182bb0264801caa0cc Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Fri, 14 Mar 2025 14:07:08 +0100 Subject: [PATCH 06/12] use -av arg for git branch command --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e6801b2c5..d549fceab 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1062,10 +1062,10 @@ check-naming-of-branch-for-main-pc-merges: - ivas-basop-linux script: - *update-scripts-repo - - git branch --list + - git branch -av - if [[ ! "$CI_MERGE_REQUEST_TITLE" =~ \[skip[[:space:]_-]name[[:space:]_-]check\] ]] && [[ ! "$CI_MERGE_REQUEST_TITLE" =~ \[CI\] ]]; then - git fetch - - git branch --list + - git branch -av - ci/get_float_ref_branch_name.sh $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME - fi -- GitLab From a3e33d36e9483f0e92a6db81fa879e75536574da Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Fri, 14 Mar 2025 14:33:48 +0100 Subject: [PATCH 07/12] dummy commit to trigger CI -- GitLab From 8583d6677d115474e6978a801aff307bfc41cabd Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Fri, 14 Mar 2025 14:38:24 +0100 Subject: [PATCH 08/12] more debug printout... --- .gitlab-ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d549fceab..d313d639d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1064,8 +1064,9 @@ check-naming-of-branch-for-main-pc-merges: - *update-scripts-repo - git branch -av - if [[ ! "$CI_MERGE_REQUEST_TITLE" =~ \[skip[[:space:]_-]name[[:space:]_-]check\] ]] && [[ ! "$CI_MERGE_REQUEST_TITLE" =~ \[CI\] ]]; then - - git fetch - - git branch -av + - float_ref_branchname="${branchname/basop/ref}" + - git_result=$(git branch -av --list "$float_ref_branchname") + - echo "$git_result" - ci/get_float_ref_branch_name.sh $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME - fi -- GitLab From d9721934c1922732da8dbef49a7cec346d6b97e6 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Fri, 14 Mar 2025 14:40:00 +0100 Subject: [PATCH 09/12] fix last commit --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d313d639d..ddd665f8f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1064,6 +1064,7 @@ check-naming-of-branch-for-main-pc-merges: - *update-scripts-repo - git branch -av - if [[ ! "$CI_MERGE_REQUEST_TITLE" =~ \[skip[[:space:]_-]name[[:space:]_-]check\] ]] && [[ ! "$CI_MERGE_REQUEST_TITLE" =~ \[CI\] ]]; then + - branchname="$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME" - float_ref_branchname="${branchname/basop/ref}" - git_result=$(git branch -av --list "$float_ref_branchname") - echo "$git_result" -- GitLab From 4c39492de6c619da105ceda2c4b7769f6c951b0f Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Fri, 14 Mar 2025 14:46:05 +0100 Subject: [PATCH 10/12] more debugging --- .gitlab-ci.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ddd665f8f..59a7a99fc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1062,12 +1062,17 @@ check-naming-of-branch-for-main-pc-merges: - ivas-basop-linux script: - *update-scripts-repo - - git branch -av - if [[ ! "$CI_MERGE_REQUEST_TITLE" =~ \[skip[[:space:]_-]name[[:space:]_-]check\] ]] && [[ ! "$CI_MERGE_REQUEST_TITLE" =~ \[CI\] ]]; then + - set -euxo - branchname="$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME" - float_ref_branchname="${branchname/basop/ref}" + - git branch -av + - git branch -av --list || true + - git branch -av --list $branchname + - git branch -av --list "$float_ref_branchname" - git_result=$(git branch -av --list "$float_ref_branchname") - echo "$git_result" + - set +euxo - ci/get_float_ref_branch_name.sh $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME - fi -- GitLab From 2cf229b2d2e23183de25644cefb1a8d1f24c2343 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Fri, 14 Mar 2025 14:54:31 +0100 Subject: [PATCH 11/12] try with different script branch from flaot repo --- .gitlab-ci.yml | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 59a7a99fc..00b954ca6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -29,7 +29,7 @@ variables: MERGE_TARGET_DECODER_PATH_FOR_BUILD_DO_NOT_MODIFY: "./IVAS_dec_merge_target" LEVEL_SCALING: "1.0" IVAS_PIPELINE_NAME: '' - BASOP_CI_BRANCH_PC_REPO: "basop-ci-branch" + BASOP_CI_BRANCH_PC_REPO: "basop-ci/fix-get-float-ref-script" PRM_FILES: "scripts/config/self_test.prm scripts/config/self_test_ltv.prm" TESTCASE_TIMEOUT_STV: 900 TESTCASE_TIMEOUT_LTV: 2400 @@ -1063,16 +1063,6 @@ check-naming-of-branch-for-main-pc-merges: script: - *update-scripts-repo - if [[ ! "$CI_MERGE_REQUEST_TITLE" =~ \[skip[[:space:]_-]name[[:space:]_-]check\] ]] && [[ ! "$CI_MERGE_REQUEST_TITLE" =~ \[CI\] ]]; then - - set -euxo - - branchname="$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME" - - float_ref_branchname="${branchname/basop/ref}" - - git branch -av - - git branch -av --list || true - - git branch -av --list $branchname - - git branch -av --list "$float_ref_branchname" - - git_result=$(git branch -av --list "$float_ref_branchname") - - echo "$git_result" - - set +euxo - ci/get_float_ref_branch_name.sh $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME - fi -- GitLab From 49de6d513ed5c6430389bfda073ab7ee8e0c188b Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Fri, 14 Mar 2025 15:21:22 +0100 Subject: [PATCH 12/12] change scripts branch back --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 00b954ca6..57ae48287 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -29,7 +29,7 @@ variables: MERGE_TARGET_DECODER_PATH_FOR_BUILD_DO_NOT_MODIFY: "./IVAS_dec_merge_target" LEVEL_SCALING: "1.0" IVAS_PIPELINE_NAME: '' - BASOP_CI_BRANCH_PC_REPO: "basop-ci/fix-get-float-ref-script" + BASOP_CI_BRANCH_PC_REPO: "basop-ci-branch" PRM_FILES: "scripts/config/self_test.prm scripts/config/self_test_ltv.prm" TESTCASE_TIMEOUT_STV: 900 TESTCASE_TIMEOUT_LTV: 2400 -- GitLab