Commit 445fb879 authored by multrus's avatar multrus
Browse files

Merge branch... 

Merge branch 'basop-2472-msan-use-of-uninitialized-value-in-lib_enc-ivas_mct_enc_mct_fx-c-1115-21' into 'main'

[non-BE][split-non-BE] Resolve "MSAN: use-of-uninitialized-value in lib_enc/ivas_mct_enc_mct_fx.c:1115:21"

Closes #2472

See merge request !2870
parents 22c5527c 743f1417

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -107,9 +107,9 @@ 
#define FIX_2440_AGC_PRESCALING                         /* FhG: basop issue 2440: Fix loop bounds when scaling p_output_fx before ivas_spar_dec_agc_pca_fx() */

#define FIX_2471_REMOVE_POSSIBLE_OVRF                   /* VA: basop issue 2471: correcting undesired overflow */

#define FIX_2465_Q_BWE_EXC                              /* VA: basop issue 2465: fix calculation of Q_bwe_exc in SWB TBE encoder */



#define FIX_2436_CLDFBANAHANDLE_ADRESS                  /*FhG: cldfb handle pointer were handed over in faulty manner*/

#define FIX_BASOP_2436_REUSED_CLDFB_IN_OMASA_SR         /*FhG: basop issue 2436 (related to basop 2283): fix garbage output for >1 object OMASA with extrend as ISAR prerenderer */

#define FIX_BASOP_2472_IGF_SP_AUD_DEC_CHAN              /* FhG: always use channel 1 for sp_aud_decision0[] being passed to ProcessIGF_ivas_fx() */



/* ##################### End NON-BE switches ########################### */

lib_enc/ivas_mct_enc_mct_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -1107,7 +1107,11 @@ void mctStereoIGF_enc_fx( 
                    q_spectrum = sub( 31, st->hTcxEnc->spectrum_e[n] );



                    set16_fx( exp_powerSpec[p_ch[ch]], sub( Q31, q_powerSpec[p_ch[ch]] ), L_FRAME48k );

#ifdef FIX_BASOP_2472_IGF_SP_AUD_DEC_CHAN

                    ProcessIGF_ivas_fx( st, L_FRAME48k, st->hTcxEnc->spectrum_fx[n], &q_spectrum, orig_spectrum_fx[p_ch[ch]][n], q_origSpec, &powerSpec_fx[p_ch[ch]][n * L_subframeTCX], &exp_powerSpec[p_ch[ch]][n * L_subframeTCX], st->core == TCX_20_CORE, n, sp_aud_decision0[ch1], 0 );

#else

                    ProcessIGF_ivas_fx( st, L_FRAME48k, st->hTcxEnc->spectrum_fx[n], &q_spectrum, orig_spectrum_fx[p_ch[ch]][n], q_origSpec, &powerSpec_fx[p_ch[ch]][n * L_subframeTCX], &exp_powerSpec[p_ch[ch]][n * L_subframeTCX], st->core == TCX_20_CORE, n, sp_aud_decision0[ch], 0 );

#endif



                    st->hTcxEnc->spectrum_e[n] = sub( 31, q_spectrum );

                    move16();