diff --git a/lib_com/ivas_cnst.h b/lib_com/ivas_cnst.h index 4080485f60dae0c875c5133e06e6f953a33e24bc..0c84499778e22db170b034ef2ba6a4ca3b16b62e 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 old mode 100644 new mode 100755 index db585550d02d406affbcab519e892bdc2164aef9..7197d86b75fa17e489fe0e4b310c8d46a6b2bebe --- a/lib_com/options.h +++ b/lib_com/options.h @@ -197,6 +197,7 @@ #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 */ #define FIX_622_SILENCE_USAN_WARNING /* FhG: silenceusan warning in ifft code */ /* ################## End BE DEVELOPMENT switches ######################### */ diff --git a/lib_dec/ivas_mdct_core_dec.c b/lib_dec/ivas_mdct_core_dec.c index deb62940661183ffd59ad804b8a7b930f79a0820..f201decee14f06bc850e69ba92ce4e58042e7ff7 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 );