Commit 63842b01 authored by vaillancour's avatar vaillancour
Browse files

fix some asan errors

parent 9a28cfa3

lib_enc/find_uv_fx.c

+16 −4
Original line number Diff line number Diff line
@@ -733,13 +733,19 @@ Word16 find_uv_fx( /* o : coding type 
     * Total frame energy difference (dE3)

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



    dE3 = sub( Etot, extract_h( hNoiseEst->Etot_last_32fx ) ); /*Q8*/

#ifdef FIX_2349_HARM_FIND_UV

    if ( st_fx->element_mode == EVS_MONO ) /* Overwrite DE3 in case of EVS */

    IF ( st_fx->element_mode == EVS_MONO ) /* Overwrite DE3 in case of EVS */

    {

        dE3 = sub( Etot, hNoiseEst->Etot_last_fx ); /*Q8*/

    }

    ELSE

    {

        dE3 = sub( Etot, extract_h( hNoiseEst->Etot_last_32fx ) ); /*Q8*/

    }

#else

    dE3 = sub( Etot, extract_h( hNoiseEst->Etot_last_32fx ) ); /*Q8*/

#endif



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

     * Energy decrease after spike (dE2)

     *-----------------------------------------------------------------*/
@@ -863,13 +869,19 @@ Word16 find_uv_fx( /* o : coding type 
    {

        ee1_th = 544; /*8.5f Q6*/

        move16();

        loc_lp_noise = extract_h( st_fx->lp_noise_32fx );

#ifdef FIX_2349_HARM_FIND_UV

        if ( st_fx->element_mode == EVS_MONO ) /* Overwrite E_min_th in case of EVS */

        IF ( st_fx->element_mode == EVS_MONO ) /* Overwrite E_min_th in case of EVS */

        {

            loc_lp_noise = st_fx->lp_noise_fx;

        }

        ELSE

        {

            loc_lp_noise = extract_h( st_fx->lp_noise_32fx );

        }

#else

        loc_lp_noise = extract_h( st_fx->lp_noise_32fx );

#endif



        /* SC-VBR - determine the threshold on relative energy as a function of lp_noise */

        IF( st_fx->input_bwidth != NB )

        {

lib_enc/pre_proc_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -522,7 +522,7 @@ void pre_proc_fx( 


#ifdef FIX_2349_HARM_FIND_UV

    st->coder_type = find_uv_fx( st, pitch_fr, voicing_fr, inp_12k8, ee, 0L, corr_shift, relE, *Etot, hp_E,

                                 &flag_spitch, last_core_orig, NULL, *Q_new, *shift, 0 ); // Q0

                                 &flag_spitch, last_core_orig, NULL, *Q_new, *shift, 31 ); // Q0

#else

    st->coder_type = find_uv_fx( st, pitch_fr, voicing_fr, inp_12k8, ee,

                                 corr_shift, relE, *Etot, hp_E, *Q_new, &flag_spitch, *shift, last_core_orig );