From 68bafb01905aa9cbc56373c5c4092fd9795ca0a2 Mon Sep 17 00:00:00 2001 From: Markus Multrus Date: Sat, 4 Oct 2025 21:15:00 +0200 Subject: [PATCH] port Flp MR 2158 --- lib_com/options.h | 1 + lib_dec/ivas_mdct_core_dec_fx.c | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/lib_com/options.h b/lib_com/options.h index fdf73590a..5aaad2a9c 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -137,6 +137,7 @@ #define FIX_1053_REVERB_RECONFIGURATION #define TMP_FIX_1119_SPLIT_RENDERING_VOIP /* FhG: Add error check for unsupported config: split rendering with VoIP mode */ #define FIX_1113_EXTREND_ISAR /* FhG: issue 1113: fix external renderer asserts for FOA/HOA2 and CLDFB config */ +#define FIX_938_COMPILER_WARNING /* FhG: Fix compiler warning in ivas_mdct_core_reconstruct() */ /* #################### End BASOP porting switches ############################ */ diff --git a/lib_dec/ivas_mdct_core_dec_fx.c b/lib_dec/ivas_mdct_core_dec_fx.c index 8e94b2c6a..78df29c0a 100644 --- a/lib_dec/ivas_mdct_core_dec_fx.c +++ b/lib_dec/ivas_mdct_core_dec_fx.c @@ -1420,16 +1420,21 @@ void ivas_mdct_core_reconstruct_fx( { Copy_Scale_sig_16_32_no_sat( st->p_bpf_noise_buf, st->p_bpf_noise_buf_32, st->L_frame, Q11 ); // Q0 -> Q11 } + +#ifndef FIX_938_COMPILER_WARNING IF( signal_outFB_fx[ch] != NULL ) { +#endif Copy( synthFB_fx, signal_outFB_fx[ch], st->hTcxDec->L_frameTCX ); #ifdef FIX_2003_CON_TCX_OVERFLOW e_sig[ch] = sub( 15, q_syn + st->Q_syn_factor ); #else - e_sig[ch] = sub( 15, q_syn ); + e_sig[ch] = sub( 15, q_syn ); #endif move16(); +#ifndef FIX_938_COMPILER_WARNING } +#endif /* updates */ st->last_voice_factor_fx = 0; -- GitLab