From 0c5f9f0331c4e44c65a1c246a429322d8d0dcd7b Mon Sep 17 00:00:00 2001 From: knj Date: Wed, 19 Jul 2023 13:37:47 +0200 Subject: [PATCH] fix usan error by adding extra val in enum --- lib_com/ivas_cnst.h | 5 +++++ lib_com/options.h | 2 ++ lib_dec/ivas_mdct_core_dec.c | 4 ++++ 3 files changed, 11 insertions(+) diff --git a/lib_com/ivas_cnst.h b/lib_com/ivas_cnst.h index 4080485f60..0c84499778 100644 --- a/lib_com/ivas_cnst.h +++ b/lib_com/ivas_cnst.h @@ -887,7 +887,12 @@ enum fea_names #define MDCT_ST_PLC_FADEOUT_DELAY_4_LSP_FADE 3 typedef enum { +#ifdef FIX_619_ADD_UNDEF_VAL_FOR_CONCEALMENT_MODE + NOISE_GEN_MODE_UNDEF = -1, + EQUAL_CORES = 0, +#else EQUAL_CORES, +#endif TCX10_IN_0_TCX20_IN_1, TCX20_IN_0_TCX10_IN_1, } TONALMDCTCONC_NOISE_GEN_MODE; diff --git a/lib_com/options.h b/lib_com/options.h index b02e63cd1e..a06afa8838 100755 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -194,6 +194,8 @@ #define SPLIT_REND_WITH_HEAD_ROT /* Dlb,FhG: Split Rendering contributions 21 and 35 */ +#define FIX_619_ADD_UNDEF_VAL_FOR_CONCEALMENT_MODE /* FhG: fix usan error */ + /* ################## End BE DEVELOPMENT switches ######################### */ diff --git a/lib_dec/ivas_mdct_core_dec.c b/lib_dec/ivas_mdct_core_dec.c index deb6294066..f201decee1 100644 --- a/lib_dec/ivas_mdct_core_dec.c +++ b/lib_dec/ivas_mdct_core_dec.c @@ -526,7 +526,11 @@ void ivas_mdct_core_invQ( sts = hCPE->hCoreCoder; bfi = sts[0]->bfi; +#ifdef FIX_619_ADD_UNDEF_VAL_FOR_CONCEALMENT_MODE + noise_gen_mode_bfi = NOISE_GEN_MODE_UNDEF; +#else noise_gen_mode_bfi = -1; +#endif set_f( xn_buf, 0, L_MDCT_OVLP_MAX + L_FRAME_PLUS + L_MDCT_OVLP_MAX ); set_s( total_nbbits, 0, CPE_CHANNELS ); -- GitLab