From 8e7bc0e2b832fc98e0690a682c8f5605300ce11b Mon Sep 17 00:00:00 2001 From: Dominik Weckbecker Date: Tue, 19 Aug 2025 09:11:28 +0200 Subject: [PATCH 1/4] remove duplicate define from options.h --- lib_com/options.h | 1 - 1 file changed, 1 deletion(-) diff --git a/lib_com/options.h b/lib_com/options.h index 61eef7b0c..3e96e6123 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -80,7 +80,6 @@ #define FIX_1917_DIRAC_RENDER_PTR_INCR /* FhG: fix wrong pointer increment in ivas_dirac_dec_render_sf_fx() for object rendering */ #define FIX_CDLFB_BUFFER_SCALING /* FhG: fix wrong buffer scaling in ivas_dirac_dec_render_sf_fx() for object rendering */ #define FIX_ISSUE_1817_REPLACE_CARRY_OVERFLOW /* FhG: bit-exact, replace carry and overflow operations by 64-bit operations, MR 1931 */ -#define NONBE_SVD_OPTIMIZATION /* FhG: reduce WMOPS of HouseHolderReduction() in ivas_svd_dec.c() by removing redundant mathematics and using 64 bit additions */ #define FIX_1766_TCX2ACELP_BWE_ISSUE /* VA : Fix rare BWE issue when switching from TCX to ACELP */ /* #################### Start BASOP porting switches ############################ */ -- GitLab From b6c32a6c8d7000c74c324a9f43aa3e2c067bdc23 Mon Sep 17 00:00:00 2001 From: vaclav Date: Tue, 19 Aug 2025 10:24:50 +0200 Subject: [PATCH 2/4] fix MSVC warning --- lib_com/options.h | 2 +- lib_dec/ivas_svd_dec_fx.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib_com/options.h b/lib_com/options.h index 3e96e6123..a07956e8b 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -124,7 +124,7 @@ #define NONBE_FIX_1141_OSBA_ROOM_RENDERING /* FhG: Fix for issue 1141: render objects in OSBA decoder with room effect */ #define NONBE_1360_LFE_DELAY /* Dlb: LFE delay alignment when rendering in CLDFB domain*/ #define NONBE_1229_FIX_ISM1_DPID /* Eri: issue 1229: fix bug causing ISM 1 to use default -dpid instead of the specified one */ -#define NONBE_SVD_OPTIMIZATION +#define NONBE_SVD_OPTIMIZATION /* FhG: issue 1935 */ #define NONBE_FIX_1176_OSBA_REVERB_JBM_ASAN_ERROR /* Ericsson: Issue 1176, fix in TDREND_firfilt for subframes shorter than the filter length */ #define NONBE_1131_ACELP_OOB /* VA: issue 1131: fix division-by-zero in acelp gain decoding caused by wrong length of buffer update when switching from HQ core to ACELP core */ #define NONBE_1240_FIX_CORE_SELECTION_ISM_SW /* VA: issue 1240: Remove the forcing of the TCX core in ISM when switching from a high bitarte to a low one */ diff --git a/lib_dec/ivas_svd_dec_fx.c b/lib_dec/ivas_svd_dec_fx.c index 610b43a93..00a2553b9 100644 --- a/lib_dec/ivas_svd_dec_fx.c +++ b/lib_dec/ivas_svd_dec_fx.c @@ -1055,7 +1055,7 @@ static void biDiagonalReductionLeft_fx( { temp = W_add( temp, L_shr( Mpy_32_32( singularVectors[jCh][currChannel], singularVectors[jCh][iCh] ), sub( max_e, add( singularVectors_e[jCh][currChannel], singularVectors_e[jCh][iCh] ) ) ) ); } - Word16 nrm = W_norm( temp ); + nrm = W_norm( temp ); nrm = sub( nrm, 32 ); norm_x = W_shl_sat_l( temp, nrm ); norm_x_e = sub( max_e, nrm ); -- GitLab From c14158eccf92043251f7fb3bb1a5ee3ecdc03a31 Mon Sep 17 00:00:00 2001 From: Dominik Weckbecker Date: Tue, 19 Aug 2025 13:00:24 +0200 Subject: [PATCH 3/4] fix issue number in a comment in options.h --- lib_com/options.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib_com/options.h b/lib_com/options.h index 635202309..5e73dc92c 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -125,7 +125,7 @@ #define NONBE_FIX_1141_OSBA_ROOM_RENDERING /* FhG: Fix for issue 1141: render objects in OSBA decoder with room effect */ #define NONBE_1360_LFE_DELAY /* Dlb: LFE delay alignment when rendering in CLDFB domain*/ #define NONBE_1229_FIX_ISM1_DPID /* Eri: issue 1229: fix bug causing ISM 1 to use default -dpid instead of the specified one */ -#define NONBE_SVD_OPTIMIZATION /* FhG: issue 1935 */ +#define NONBE_SVD_OPTIMIZATION /* FhG: issue 1367 */ #define NONBE_FIX_1176_OSBA_REVERB_JBM_ASAN_ERROR /* Ericsson: Issue 1176, fix in TDREND_firfilt for subframes shorter than the filter length */ #define NONBE_1131_ACELP_OOB /* VA: issue 1131: fix division-by-zero in acelp gain decoding caused by wrong length of buffer update when switching from HQ core to ACELP core */ #define NONBE_1240_FIX_CORE_SELECTION_ISM_SW /* VA: issue 1240: Remove the forcing of the TCX core in ISM when switching from a high bitarte to a low one */ -- GitLab From 10024eb4f6dd7c4a9d721cf25a5e490d46b4ef6f Mon Sep 17 00:00:00 2001 From: Dominik Weckbecker Date: Wed, 20 Aug 2025 15:29:11 +0200 Subject: [PATCH 4/4] fix compile errors --- lib_com/options.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/lib_com/options.h b/lib_com/options.h index 0f561970a..9730f271a 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -130,12 +130,8 @@ #define NONBE_FIX_1141_OSBA_ROOM_RENDERING /* FhG: Fix for issue 1141: render objects in OSBA decoder with room effect */ #define NONBE_1360_LFE_DELAY /* Dlb: LFE delay alignment when rendering in CLDFB domain*/ #define NONBE_1229_FIX_ISM1_DPID /* Eri: issue 1229: fix bug causing ISM 1 to use default -dpid instead of the specified one */ -<<<<<<< HEAD #define NONBE_SVD_OPTIMIZATION /* FhG: issue 1367 */ -======= -#define NONBE_SVD_OPTIMIZATION #define FIX_1209_SID_SIGNALING /* VA: issue 1209: remove dead code in IVAS SID signaling */ ->>>>>>> origin/main #define NONBE_FIX_1176_OSBA_REVERB_JBM_ASAN_ERROR /* Ericsson: Issue 1176, fix in TDREND_firfilt for subframes shorter than the filter length */ #define NONBE_1131_ACELP_OOB /* VA: issue 1131: fix division-by-zero in acelp gain decoding caused by wrong length of buffer update when switching from HQ core to ACELP core */ #define NONBE_1240_FIX_CORE_SELECTION_ISM_SW /* VA: issue 1240: Remove the forcing of the TCX core in ISM when switching from a high bitarte to a low one */ -- GitLab