Commit 6dc59660 authored by Sandesh Venkatesh's avatar Sandesh Venkatesh
Browse files

Merge branch 'Windows_warnings_MSAN_error_fixes_cleanup' into 'main' 

MSVS warnings fix, MSAN error fixes and Float code cleanup.

See merge request !280
parents e247d062 093b8b4d

lib_com/cldfb.c

+6 −6
Original line number Diff line number Diff line
@@ -856,12 +856,12 @@ void cldfbAnalysis_ts_fx( 


        /* FFT of DST IV */

        Word16 q_shift;

        q_shift =  sub(s_min(getScaleFactor32(rBuffer_fx, 2 * CLDFB_NO_CHANNELS_MAX), getScaleFactor32(iBuffer_fx, 2 * CLDFB_NO_CHANNELS_MAX)), find_guarded_bits_fx(M2));

        q_shift =  sub(s_min(getScaleFactor32(rBuffer_fx, 2 * M2), getScaleFactor32(iBuffer_fx, 2 * M2)), find_guarded_bits_fx(M2));

        *q_cldfb = add(*q_cldfb, q_shift);

        for (Word16 ind = 0; ind < 2 * CLDFB_NO_CHANNELS_MAX; ind++) {

        for (Word16 ind = 0; ind < 2 * M2; ind++) {

            rBuffer_fx[ind] = L_shl(rBuffer_fx[ind], q_shift);

        }

        for (Word16 ind = 0; ind < 2 * CLDFB_NO_CHANNELS_MAX; ind++) {

        for (Word16 ind = 0; ind < 2 * M2; ind++) {

            iBuffer_fx[ind] = L_shl(iBuffer_fx[ind], q_shift);

        }

        fft_cldfb_fx( rBuffer_fx, M2 );
@@ -878,12 +878,12 @@ void cldfbAnalysis_ts_fx( 
        /* FFT of DCT IV */

        fft_cldfb_fx( iBuffer_fx, M2 );



        q_shift =  s_min(getScaleFactor32(rBuffer_fx, 2 * CLDFB_NO_CHANNELS_MAX), getScaleFactor32(iBuffer_fx, 2 * CLDFB_NO_CHANNELS_MAX));

        q_shift =  s_min(getScaleFactor32(rBuffer_fx, 2 * M2), getScaleFactor32(iBuffer_fx, 2 * M2));

        *q_cldfb = add(*q_cldfb, q_shift);

        for (Word16 ind = 0; ind < 2 * CLDFB_NO_CHANNELS_MAX; ind++) {

        for (Word16 ind = 0; ind < 2 * M2; ind++) {

            rBuffer_fx[ind] = L_shl(rBuffer_fx[ind], q_shift);

        }

        for (Word16 ind = 0; ind < 2 * CLDFB_NO_CHANNELS_MAX; ind++) {

        for (Word16 ind = 0; ind < 2 * M2; ind++) {

            iBuffer_fx[ind] = L_shl(iBuffer_fx[ind], q_shift);

        }

lib_com/fd_cng_com_fx.c

+1 −0
Original line number Diff line number Diff line
@@ -163,6 +163,7 @@ void ivas_initFdCngCom_fx( HANDLE_FD_CNG_COM hFdCngCom, Word16 scale ) 
    set32_fx( hFdCngCom->olapBufferSynth_fx, 0, FFTLEN );

    set32_fx( hFdCngCom->olapBufferSynth2_fx, 0, FFTLEN );

    set32_fx( hFdCngCom->exc_cng_32fx, 0, L_FRAME16k );

    set16_fx( hFdCngCom->exc_cng, 0, L_FRAME16k );

    hFdCngCom->likelihood_noisy_speech_32fx = 0;

    move32();

lib_com/float_to_fix_ops.c

+3 −9
Original line number Diff line number Diff line
@@ -269,15 +269,12 @@ void stereo_tcx_dec_mode_switch_reconf_To_fixed( 
        //H_IGF_INFO hIGFInfo = &hPrivateData->igfInfo;

        //ACELP_config *pConfigAcelp = &( st->acelp_cfg );

        Word16 i = 0,

            Q_old_synth = 0, Q_syn = 0, Q_synth_history = 0, /*Q_fer_samples = 0,*/

            Q_old_synth = 0, Q_syn = 0,/* Q_synth_history = 0,*/ /*Q_fer_samples = 0,*/

            Q_cldfbAna_cldfb_state = 0, Q_cldfbBPF_cldfb_state = 0, Q_cldfbSyn_cldfb_state = 0, Q_cldfbSynHB_cldfb_state = 0;//,

            //Q_pst_old_syn = 0,

            //delay_comp = 0;



        Word16 Q_lsf_cng = Q_factor( 6400 );

        Word16 Q_tcxltp_mem_in = 0, Q_tcxltp_mem_out = 0;

        TD_BWE_DEC_HANDLE hBWE_TD = st->hBWE_TD;

        Word16 Q_state_lsyn_filt_shb = 0, Q_state_lsyn_filt_dwn_shb = 0, Q_mem_resamp_HB = 0, Q_syn_overlap = 0, Q_int_3_over_2_tbemem_dec = 0, Q_mem_resamp_HB_32k = 0/*, Q_prev_fb_ener_adjust = 0 */;



        if ( tofix )

        {
@@ -497,9 +494,6 @@ void stereo_tcx_dec_mode_switch_reconf_To_fixed_2( 
               //Q_pst_old_syn = 0,

               //delay_comp = 0;



        Word16 Q_tcxltp_mem_in = 0, Q_tcxltp_mem_out = 0;

        TD_BWE_DEC_HANDLE hBWE_TD = st->hBWE_TD;

        Word16 Q_state_lsyn_filt_shb = 0, Q_state_lsyn_filt_dwn_shb = 0, Q_mem_resamp_HB = 0, Q_syn_overlap = 0, Q_int_3_over_2_tbemem_dec = 0, Q_mem_resamp_HB_32k = 0/*, Q_prev_fb_ener_adjust = 0*/;



        if ( tofix )

        {
@@ -791,7 +785,7 @@ void fixed_to_float_stereo_tcx_core_dec( 
    Decoder_State *st,

    Word16 *signal_out )

{

    TCX_DEC_HANDLE hTcxDec = st->hTcxDec;

    //TCX_DEC_HANDLE hTcxDec = st->hTcxDec;

    //Word16 q_Aq;

    //st->hTcxDec->tcxltp_last_gain_unmodified_float = (Word16) fixedToFloat( st->hTcxDec->tcxltp_last_gain_unmodified, Q15 );
@@ -840,7 +834,7 @@ void fixed_to_float_stereo_tcx_core_dec( 
        fixedToFloat_arr( st->p_bpf_noise_buf, st->p_bpf_noise_buf_float, 0, L_FRAME_16k );

    }



    st->hBPF->pst_mem_deemp_err_fx = st->mem_error;

    st->hBPF->pst_mem_deemp_err_fx = (Word16)st->mem_error;

    /*=================================*/

    if ( st->hFdCngDec != NULL && ( st->sr_core == INT_FS_12k8 || st->sr_core == INT_FS_16k ) && st->total_brate <= MAX_ACELP_BRATE )

    {

lib_dec/core_dec_init.c

+0 −1
Original line number Diff line number Diff line
@@ -58,7 +58,6 @@ void open_decoder_LPD( 
    const int16_t is_init            /* i  : indicate call during initialization    */

)

{

    int16_t i;

    int16_t mem_syn_r_size_old;

    int16_t mem_syn_r_size_new;

    int16_t fscaleFB;

lib_dec/init_dec_fx.c

+5 −1
Original line number Diff line number Diff line
@@ -1449,6 +1449,7 @@ ivas_error init_decoder_ivas_fx( 
#ifdef IVAS_FLOAT_FIXED_TO_BE_REMOVED // To be removed when fixed version is available.

    //  fd_bwe_dec_init_flt(st_fx->hBWE_FD);

#endif



     fd_bwe_dec_init(st_fx, st_fx->hBWE_FD);

	 }

	 ELSE
@@ -1822,6 +1823,9 @@ ivas_error init_decoder_ivas_fx( 
		{

			return (IVAS_ERROR(IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for TonalMDCTConcealment\n"));

		}

#ifdef IVAS_FLOAT_FIXED_TO_BE_REMOVED

        set_zero(st_fx->hTonalMDCTConc->timeDataBuffer_float, ( 3 * L_FRAME_MAX ) / 2);

#endif

	}

	ELSE

	{