Commit 35646f13 authored by Sandesh Venkatesh's avatar Sandesh Venkatesh
Browse files

Merge branch 'asan_msan_fixes_float_table_updates' into 'main' 

ASAN/MSAN fixes for encoder and decoder, win_lpc_hb_wb table added inline with float code

See merge request !991
parents 050dd68f 0b241bd0

lib_com/rom_com.c

+19 −0
Original line number Diff line number Diff line
@@ -14271,6 +14271,25 @@ const Word16 win_lpc_hb_wb_fx[(L_LOOK_12k8 + L_SUBFR + L_FRAME) * 5 / 32] = 
    32611,   32698,   32751

};













const Word16 win_lpc_hb_wb_ivas_fx[(L_LOOK_12k8 + L_SUBFR + L_FRAME) * 5 / 32] =













{//Q15













	6, 51, 140, 274,













	453, 675, 940, 1247,













	1596, 1985, 2414, 2882,













	3386, 3926, 4499, 5106,













	5743, 6410, 7104, 7823,













	8566, 9331, 10114, 10915,













	11731, 12559, 13398, 14245,













	15099, 15955, 16813, 17669,













	18523, 19370, 20209, 21037,













	21853, 22654, 23437, 24202,













	24945, 25664, 26358, 27025,













	27662, 28269, 28842, 29382,













	29886, 30354, 30783, 31172,













	31521, 31828, 32093, 32315,













	32494, 32628, 32717, 32762













};









































const Word16 ola_win_shb_switch_fold_fx[L_SUBFR16k] =















{//Q15

























lib_com/rom_com.h



+1
−0




























Original line number
Diff line number
Diff line








@@ -612,6 +612,7 @@ extern const Word16 cos_fb_exc_fx[32]; // Q15





























extern const Word16 win_lpc_shb_fx[];                                        // Q15 /* Window for calculating SHB LPC coeffs */















extern const Word16 win_lpc_hb_wb_fx[];                                      // Q15













extern const Word16 win_lpc_hb_wb_ivas_fx[];                                 // Q15















extern const Word16 ola_win_shb_switch_fold_fx[];                            // Q15















extern const Word16 win_flatten_fx[];                                        // Q15















extern const Word16 win_flatten_4k_fx[];                                     // Q15

































lib_dec/gs_dec_fx.c



+4
−1




























Original line number
Diff line number
Diff line








@@ -1587,7 +1587,10 @@ void gsc_dec_ivas_fx(













        {















            pvq_core_dec_fx( st_fx, gsc_sfm_start, gsc_sfm_end, gsc_sfm_size, concat_out, &Q_tmp, bit, nb_subbands, bits_per_bands, NULL, inpulses_fx, imaxpulse_fx, ACELP_CORE );















#ifdef MSAN_FIX













            Scale_sig( concat_out, s_max( gsc_sfm_end[nb_subbands - 1], 0 ), sub( Q_PVQ_OUT, Q_tmp ) ); /* Q_PVQ_OUT */













            IF( nb_subbands > 0 )













            {













                Scale_sig( concat_out, gsc_sfm_end[nb_subbands - 1], sub( Q_PVQ_OUT, Q_tmp ) ); /* Q_PVQ_OUT */













            }















#else















            Scale_sig( concat_out, gsc_sfm_end[nb_subbands - 1], sub( Q_PVQ_OUT, Q_tmp ) ); /* Q_PVQ_OUT */















#endif

































lib_enc/acelp_core_enc_fx.c



+1
−0




























Original line number
Diff line number
Diff line








@@ -867,6 +867,7 @@ ivas_error acelp_core_enc_ivas_fx(













    Word32 q_env_fx[NUM_ENV_CNG];















#ifdef MSAN_FIX















    set32_fx( q_env_fx, 0, NUM_ENV_CNG );













    set16_fx( exc2_fx, 0, L_FRAME16k );















#endif















    Word16 exc3_fx[L_FRAME16k];















    Word16 syn1_fx[L_FRAME16k];

































lib_enc/enc_tran_fx.c



+5
−0




























Original line number
Diff line number
Diff line








@@ -508,6 +508,11 @@ Word16 encod_tran_ivas_fx(





























    L_frame_fx = st_fx->L_frame;















    move16();



























#ifdef MSAN_FIX













    set16_fx( h1, 0, L_SUBFR + ( M + 1 ) );













#endif





























    /*------------------------------------------------------------------*















     * Initializations















     *------------------------------------------------------------------*/