Commit b0aca655 authored by Sandesh Venkatesh's avatar Sandesh Venkatesh
Browse files

Fix-2 for ASAN and MSAN errors

parent 6db2002b

lib_com/cldfb.c

+6 −0
Original line number Diff line number Diff line
@@ -1675,6 +1675,7 @@ ivas_error openCldfb_ivas_fx( 
    // configureCldfb_ivas( hs, sampling_rate );

    configureCldfb_ivas_fx( hs, sampling_rate );

    hs->memory_flt = NULL;

    hs->FilterStates = NULL;

    hs->memory_length = 0;

    move16();
@@ -2087,6 +2088,11 @@ void deleteCldfb_ivas( 
    {

        free( hs->cldfb_state_fx );

    }



    IF( hs->FilterStates )

    {

        free( hs->FilterStates );

    }

#endif



    free( hs );

lib_dec/ivas_init_dec.c

+2 −2
Original line number Diff line number Diff line
@@ -3043,7 +3043,7 @@ ivas_error ivas_init_decoder_fx( 


    FOR( i = 0; i < numCldfbAnalyses; i++ )

    {

        IF( NE_32( ( error = openCldfb_ivas( &( st_ivas->cldfbAnaDec[i] ), CLDFB_ANALYSIS, output_Fs, CLDFB_PROTOTYPE_5_00MS ) ), IVAS_ERR_OK ) )

        IF( NE_32( ( error = openCldfb_ivas_fx( &( st_ivas->cldfbAnaDec[i] ), CLDFB_ANALYSIS, output_Fs, CLDFB_PROTOTYPE_5_00MS ) ), IVAS_ERR_OK ) )

        {

            return error;

        }
@@ -3055,7 +3055,7 @@ ivas_error ivas_init_decoder_fx( 


    FOR( i = 0; i < numCldfbSyntheses; i++ )

    {

        IF( NE_32( ( error = openCldfb_ivas( &( st_ivas->cldfbSynDec[i] ), CLDFB_SYNTHESIS, output_Fs, CLDFB_PROTOTYPE_5_00MS ) ), IVAS_ERR_OK ) )

        IF( NE_32( ( error = openCldfb_ivas_fx( &( st_ivas->cldfbSynDec[i] ), CLDFB_SYNTHESIS, output_Fs, CLDFB_PROTOTYPE_5_00MS ) ), IVAS_ERR_OK ) )

        {

            return error;

        }

lib_enc/ivas_front_vad.c

+11 −0
Original line number Diff line number Diff line
@@ -543,7 +543,9 @@ ivas_error front_vad_spar( 
        //  Q_bands = Q_factor_arrL( fr_bands[0], 2 * NB_BANDS );

        floatToFixed_arrL( fr_bands[0], fr_bands_fx[0], Q_bands + QSCALE, 2 * NB_BANDS );

        floatToFixed_arrL( hFrontVad->hNoiseEst->bckr, hFrontVad->hNoiseEst->bckr_fx, Q_bands + QSCALE, NB_BANDS );

#ifndef MSAN_FIX

        floatToFixed_arrL( tmpE, tmpE_fx, Q_bands + QSCALE, NB_BANDS );

#endif

        hFrontVad->hNoiseEst->totalNoise_fx = (Word16) ( hFrontVad->hNoiseEst->totalNoise * ONE_IN_Q8 );

        Etot_fx[0] = (Word16) ( Etot[0] * ONE_IN_Q8 );

        hFrontVad->hNoiseEst->Etot_last_fx = (Word16) ( hFrontVad->hNoiseEst->Etot_last * ONE_IN_Q8 );
@@ -626,7 +628,12 @@ ivas_error front_vad_spar( 


        Q_inp_12k8 = Q9; // Q_factor_arr( inp_12k8-M, (3 * L_FRAME / 2)+M );

        floatToFixed_arr( inp_12k8 - M, inp_12k8_fx - M, Q_inp_12k8, ( 3 * L_FRAME / 2 ) + M );

#ifdef MSAN_FIX

        floatToFixed_arr( A, A_fx, Q12, ( L_FRAME / L_SUBFR ) * ( M + 1 ) );

#else

        floatToFixed_arr( A, A_fx, Q12, NB_SUBFR16k * ( M + 1 ) );

#endif // MSAN_FIX



        st->mem_wsp_fx = (Word16) floatToFixed( st->mem_wsp, Q_inp_12k8 );

        // find_wsp_fx( A_fx, inp_12k8_fx, wsp_fx, &st->mem_wsp_fx, TILT_FAC_FX, L_FRAME, L_LOOK_12k8, L_SUBFR, Aw_fx, GAMMA1, NB_SUBFR );

        ivas_find_wsp( L_FRAME, L_SUBFR, NB_SUBFR, A_fx, Aw_fx, inp_12k8_fx, TILT_FAC_FX, wsp_fx, &st->mem_wsp_fx, GAMMA1, L_LOOK_12k8 );
@@ -767,7 +774,11 @@ ivas_error front_vad_spar( 
        corr_shift_fx = (Word16) floatToFixed( corr_shift, Q15 );

        hFrontVad->hVAD->running_avg_fx = (Word16) floatToFixed( hFrontVad->hVAD->running_avg, Q15 );

        hFrontVad->hVAD->ra_deltasum_fx = (Word16) floatToFixed( hFrontVad->hVAD->ra_deltasum, Q15 );

#ifdef MSAN_FIX

        floatToFixed_arr( A, A_fx, Q12, ( L_FRAME / L_SUBFR ) * ( M + 1 ) );

#else

        floatToFixed_arr( A, A_fx, Q12, NB_SUBFR16k * ( M + 1 ) );

#endif // MSAN_FIX

        floatToFixed_arr( st->voicing, st->voicing_fx, Q15, 3 );

        vad_param_updt_fx( st, st->pitch[1], corr_shift_fx, corr_shift_fx, A_fx, &hFrontVad, 1 );

        hFrontVad->hVAD->running_avg = fixedToFloat( hFrontVad->hVAD->running_avg_fx, Q15 );

lib_enc/speech_music_classif.c

+3 −0
Original line number Diff line number Diff line
@@ -124,6 +124,9 @@ void speech_music_clas_init( 
#ifdef IVAS_FLOAT_FIXED

    hSpMusClas->dlp_mean_ST_fx = 0;

    hSpMusClas->dlp_var_LT_fx = 0;

#ifdef MSAN_FIX

    hSpMusClas->dlp_mean_LT_fx = 0;

#endif // MSAN_FIX

#endif

    hSpMusClas->dlp_mean_LT = 0.0f;

    hSpMusClas->dlp_var_LT = 0.0f;

lib_rend/ivas_mcmasa_ana.c

+1 −1
Original line number Diff line number Diff line
@@ -253,7 +253,7 @@ ivas_error ivas_mcmasa_ana_open( 
    move16();

    FOR( i = 0; i < hMcMasa->num_Cldfb_instances; i++ )

    {

        IF( NE_32( ( error = openCldfb_ivas( &( hMcMasa->cldfbAnaEnc[i] ), CLDFB_ANALYSIS, input_Fs, CLDFB_PROTOTYPE_5_00MS ) ), IVAS_ERR_OK ) )

        IF( NE_32( ( error = openCldfb_ivas_fx( &( hMcMasa->cldfbAnaEnc[i] ), CLDFB_ANALYSIS, input_Fs, CLDFB_PROTOTYPE_5_00MS ) ), IVAS_ERR_OK ) )

        {

            return error;

        }