From 9e53d547b708e158dd22820ab39a9a434c95f4ab Mon Sep 17 00:00:00 2001 From: Markus Multrus Date: Wed, 25 Jun 2025 21:16:21 +0200 Subject: [PATCH 1/2] fix compiler warnings --- lib_com/options.h | 1 + lib_dec/ivas_mdct_core_dec.c | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/lib_com/options.h b/lib_com/options.h index 9473a7cc22..d09db1a117 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -162,6 +162,7 @@ /*#define FIX_I4_OL_PITCH*/ /* fix open-loop pitch used for EVS core switching */ #define TMP_FIX_1119_SPLIT_RENDERING_VOIP /* FhG: Add error check for unsupported config: split rendering with VoIP mode */ #define FIX_1335_EXTREND_RETCODE /* FhG: Add modification of returncode for external renderer when an error occurs */ +#define FIX_938_COMPILER_WARNING /* FhG: Fix compiler warning in ivas_mdct_core_reconstruct() */ /* #################### End BE switches ################################## */ diff --git a/lib_dec/ivas_mdct_core_dec.c b/lib_dec/ivas_mdct_core_dec.c index d03cc5afd9..bc8c3b95c6 100644 --- a/lib_dec/ivas_mdct_core_dec.c +++ b/lib_dec/ivas_mdct_core_dec.c @@ -943,10 +943,14 @@ void ivas_mdct_core_reconstruct( /* Postfiltering */ post_decoder( st, synth_buf, pit_gain[ch], pitch[ch], x[ch][0], st->p_bpf_noise_buf ); +#ifndef FIX_938_COMPILER_WARNING if ( signal_outFB[ch] ) { +#endif mvr2r( synthFB, signal_outFB[ch], st->hTcxDec->L_frameTCX ); +#ifndef FIX_938_COMPILER_WARNING } +#endif #ifdef DEBUG_PLC_INFO { -- GitLab From 38b198b14b8b4a6177cb2c09ea76da7d0cc74ea0 Mon Sep 17 00:00:00 2001 From: Markus Multrus Date: Wed, 25 Jun 2025 21:22:10 +0200 Subject: [PATCH 2/2] formatting --- lib_dec/ivas_mdct_core_dec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib_dec/ivas_mdct_core_dec.c b/lib_dec/ivas_mdct_core_dec.c index bc8c3b95c6..7bb81b4aff 100644 --- a/lib_dec/ivas_mdct_core_dec.c +++ b/lib_dec/ivas_mdct_core_dec.c @@ -946,7 +946,7 @@ void ivas_mdct_core_reconstruct( #ifndef FIX_938_COMPILER_WARNING if ( signal_outFB[ch] ) { -#endif +#endif mvr2r( synthFB, signal_outFB[ch], st->hTcxDec->L_frameTCX ); #ifndef FIX_938_COMPILER_WARNING } -- GitLab