From 8a4657c6b654811035cea8d9bfa3e3f7688a2481 Mon Sep 17 00:00:00 2001 From: gerstack Date: Thu, 18 Sep 2025 11:14:20 +0200 Subject: [PATCH 1/2] Fix Issue 2027, MR 2245 --- lib_enc/cod_tcx_fx.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/lib_enc/cod_tcx_fx.c b/lib_enc/cod_tcx_fx.c index 611a92b5e..4a1222aa9 100644 --- a/lib_enc/cod_tcx_fx.c +++ b/lib_enc/cod_tcx_fx.c @@ -3537,7 +3537,11 @@ void QuantizeTCXSpectrum_fx( move16(); } +#ifndef FIX_ISSUE_1965_REPLACE_CARRY_OVERFLOW tmp32 = L_deposit_l( 0 ); +#else + Word64 tmp64 = 0; +#endif FOR( i = 0; i < L_spec; i++ ) { spectrum_fx[i] = L_mult( sqQ[i], 1 << ( 30 - SPEC_EXP_DEC ) ); @@ -3546,13 +3550,18 @@ void QuantizeTCXSpectrum_fx( #ifndef FIX_ISSUE_1965_REPLACE_CARRY_OVERFLOW tmp32 = L_macNs_co( tmp32, abs_s( sqQ[i] ), i, &Carry, &Overflow ); #else - tmp32 = L_macNs( tmp32, abs_s( sqQ[i] ), i ); + tmp64 = W_mac_16_16( tmp64, abs_s( sqQ[i] ), i ); #endif } *spectrum_e = SPEC_EXP_DEC; move16(); +#ifndef FIX_ISSUE_1965_REPLACE_CARRY_OVERFLOW *nf_seed = extract_l( tmp32 ); +#else + assert( W_extract_h( tmp64 ) == 0 ); + *nf_seed = extract_l( W_extract_l( tmp64 ) ); +#endif } ELSE { -- GitLab From 9401f7b025b5933534a4668de9bf4cae5c02c709 Mon Sep 17 00:00:00 2001 From: gerstack Date: Thu, 18 Sep 2025 11:31:03 +0200 Subject: [PATCH 2/2] Fix Issue 2027, MR 2245 --- lib_com/ivas_ism_com_fx.c | 2 +- lib_dec/ivas_init_dec_fx.c | 2 +- lib_enc/ivas_enc_fx.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib_com/ivas_ism_com_fx.c b/lib_com/ivas_ism_com_fx.c index 4cb4b5df2..8c94f3b40 100644 --- a/lib_com/ivas_ism_com_fx.c +++ b/lib_com/ivas_ism_com_fx.c @@ -38,7 +38,7 @@ #include "prot_fx.h" #include "ivas_stat_com.h" #include "ivas_rom_com.h" -#include "ivas_rom_com_fx.h" +//#include "ivas_rom_com_fx.h" #include "wmc_auto.h" #include "ivas_prot_fx.h" diff --git a/lib_dec/ivas_init_dec_fx.c b/lib_dec/ivas_init_dec_fx.c index 6d1b09d21..164fe9597 100644 --- a/lib_dec/ivas_init_dec_fx.c +++ b/lib_dec/ivas_init_dec_fx.c @@ -38,7 +38,7 @@ #include "ivas_prot_rend_fx.h" #include "rom_com.h" #include "ivas_rom_com.h" -#include "ivas_rom_com_fx.h" +//#include "ivas_rom_com_fx.h" #include "ivas_stat_enc.h" #include "prot_fx.h" #include "wmc_auto.h" diff --git a/lib_enc/ivas_enc_fx.c b/lib_enc/ivas_enc_fx.c index c73a1a6b0..91549ea0a 100644 --- a/lib_enc/ivas_enc_fx.c +++ b/lib_enc/ivas_enc_fx.c @@ -38,7 +38,7 @@ #include "rom_com.h" #include "prot_fx.h" #include "ivas_rom_com.h" -#include "ivas_rom_com_fx.h" +//#include "ivas_rom_com_fx.h" #ifdef DEBUGGING #include "debug.h" #endif -- GitLab