From 3de57e41b396dcff102fd3f2fe36409c7bc4d014 Mon Sep 17 00:00:00 2001 From: Eleni Fotopoulou Date: Thu, 6 Jun 2024 09:40:58 +0200 Subject: [PATCH 1/2] revert threshold for svd zero flush --- lib_com/options.h | 3 ++- lib_dec/ivas_svd_dec.c | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/lib_com/options.h b/lib_com/options.h index ea4a4576ec..62624926b2 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -179,7 +179,8 @@ /* any switch which is non-be wrt selection floating point code */ /* all switches in this category should start with "NONBE_" */ -#define NONBE_FIX_1070_USAN_SEGFAULT_MC_TO_BIN_BTSW_HEADROT /* fix 1070 USAN: nullptr-with-offset and Segfaults in 7_1_4 to BINAURAL and BINAURAL_ROOM_REVERB decoding with bitrate switching and head rotation*/ +#define NONBE_FIX_1070_USAN_SEGFAULT_MC_TO_BIN_BTSW_HEADROT /* fix 1070 USAN: nullptr-with-offset and Segfaults in 7_1_4 to BINAURAL and BINAURAL_ROOM_REVERB decoding with bitrate switching and head rotation*/ +#define REVERT_ZERO_FLUSH_TRESH /* FhG: issue 1069: revert threshold value introduced with !1518 due to significant complexity increase*/ /* ##################### End NON-BE switches ########################### */ /* ################## End DEVELOPMENT switches ######################### */ diff --git a/lib_dec/ivas_svd_dec.c b/lib_dec/ivas_svd_dec.c index ebef0644ee..3b475f547e 100644 --- a/lib_dec/ivas_svd_dec.c +++ b/lib_dec/ivas_svd_dec.c @@ -51,7 +51,11 @@ #define SVD_MINIMUM_VALUE 1e-32f /* minimum value */ #define CONVERGENCE_FACTOR 1.0e-04f /* factor for SVD convergence */ #define SVD_MAX_NUM_ITERATION 75 /* maximum number of interations before exiting the SVD */ +#ifdef REVERT_ZERO_FLUSH_TRESH +#define SVD_ZERO_FLUSH_THRESHOLD 1.0e-20f +#else #define SVD_ZERO_FLUSH_THRESHOLD 0.0f +#endif /*-----------------------------------------------------------------------* -- GitLab From 9f855cff909cdf1b5a2b173d1803dabc8c63409e Mon Sep 17 00:00:00 2001 From: Eleni Fotopoulou Date: Thu, 6 Jun 2024 09:47:39 +0200 Subject: [PATCH 2/2] clang format --- lib_dec/ivas_svd_dec.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib_dec/ivas_svd_dec.c b/lib_dec/ivas_svd_dec.c index 3b475f547e..5c84af950b 100644 --- a/lib_dec/ivas_svd_dec.c +++ b/lib_dec/ivas_svd_dec.c @@ -48,9 +48,9 @@ *-----------------------------------------------------------------------*/ /* The SVD is sensitive to changes to the following constants, so please be careful when trying to tune things */ -#define SVD_MINIMUM_VALUE 1e-32f /* minimum value */ -#define CONVERGENCE_FACTOR 1.0e-04f /* factor for SVD convergence */ -#define SVD_MAX_NUM_ITERATION 75 /* maximum number of interations before exiting the SVD */ +#define SVD_MINIMUM_VALUE 1e-32f /* minimum value */ +#define CONVERGENCE_FACTOR 1.0e-04f /* factor for SVD convergence */ +#define SVD_MAX_NUM_ITERATION 75 /* maximum number of interations before exiting the SVD */ #ifdef REVERT_ZERO_FLUSH_TRESH #define SVD_ZERO_FLUSH_THRESHOLD 1.0e-20f #else -- GitLab