Commit e53de44e authored by TYAGIRIS's avatar TYAGIRIS
Browse files

convert double constants to float

parent 00d882ae

lib_enc/SNR_calc.c

+3 −3
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ void SNR_calc( 
    {

        tmp = ( frame_sb_energy[i] + 0.0001f ) / ( sb_bg_energy[i] + 0.0001f );

        tmp = (float) log10( tmp );

        if ( tmp > -0.1 )

        if ( tmp > -0.1f )

        {

            if ( bwidth == CLDFBVAD_SWB_ID )

            {
@@ -170,7 +170,7 @@ void calc_lt_snr( 
    const float offset = -0.00156247615814208984375f;



    tmp_lt_noise_sp_center = lt_noise_sp_center0 - 1.4f;

    if ( tmp_lt_noise_sp_center > 0.8 )

    if ( tmp_lt_noise_sp_center > 0.8f )

    {

        tmp_lt_noise_sp_center = 0.8f;

    }
@@ -204,7 +204,7 @@ void calc_lt_snr( 
        rtn_lt_snr = 0.0f;

    }



    if ( rtn_lt_snr > 2.0 )

    if ( rtn_lt_snr > 2.0f )

    {

        rtn_lt_snr = 2.0f;

    }

lib_enc/ari_hm_enc.c

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ static float GetWeight( int16_t i ) 
{

    i = 3 * i - 2;



    return (float) ( pow( i, 0.3 ) / pow( 256 - 1, 0.3 ) );

    return (float) ( pow( i, 0.3f ) / pow( 256 - 1, 0.3f ) );

}

lib_enc/avq_cod.c

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ float AVQ_cod( 
        for ( i = 0; i < Nsv; i++ )

        {

            tmp = ebits[i] - offset;

            if ( tmp < 0.0 )

            if ( tmp < 0.0f )

            {

                tmp = 0.0;

            }

lib_enc/cod_tcx.c

+6 −6
Original line number Diff line number Diff line
@@ -90,9 +90,9 @@ void HBAutocorrelation( 
        r[i] = s;

    }



    if ( r[0] < 100.0 )

    if ( r[0] < 100.0f )

    {

        r[0] = 100.0;

        r[0] = 100.0f;

    }



    return;
@@ -1359,13 +1359,13 @@ void QuantizeTCXSpectrum( 
            hTcxEnc->tcx_target_bits_fac *= (float) sqTargetBits / (float) sqBits;

        }



        if ( hTcxEnc->tcx_target_bits_fac > 1.25 )

        if ( hTcxEnc->tcx_target_bits_fac > 1.25f )

        {

            hTcxEnc->tcx_target_bits_fac = 1.25;

            hTcxEnc->tcx_target_bits_fac = 1.25f;

        }

        if ( hTcxEnc->tcx_target_bits_fac < 0.75 )

        if ( hTcxEnc->tcx_target_bits_fac < 0.75f )

        {

            hTcxEnc->tcx_target_bits_fac = 0.75;

            hTcxEnc->tcx_target_bits_fac = 0.75f;

        }



        /* Refine quantizer step size with a rate-control-loop (optional) */

lib_enc/comvad_decision.c

+49 −49
Original line number Diff line number Diff line
@@ -120,14 +120,14 @@ int16_t comvad_decision( 


    if ( bw_index == CLDFBVAD_WB_ID )

    {

        if ( tsnr > 2.8 )

        if ( tsnr > 2.8f )

        {

            vad_flag = 1;

        }

    }

    else

    {

        if ( tsnr > 2.6 )

        if ( tsnr > 2.6f )

        {

            vad_flag = 1;

        }
@@ -157,7 +157,7 @@ int16_t comvad_decision( 


    if ( vad_flag == 1 )

    {

        if ( snr > hVAD_CLDFB->l_silence_snr / hVAD_CLDFB->l_silence_snr_count + 1.5 )

        if ( snr > hVAD_CLDFB->l_silence_snr / hVAD_CLDFB->l_silence_snr_count + 1.5f )

        {

            if ( l_speech_snr_count == 512 )

            {
@@ -177,19 +177,19 @@ int16_t comvad_decision( 


    if ( bw_index == CLDFBVAD_NB_ID )

    {

        if ( snr_flux > 1.9 + lt_snr * 0.28 )

        if ( snr_flux > 1.9f + lt_snr * 0.28f )

        {

            vad_flag = 1;

        }

        if ( ( snr_flux > 1.5 ) && sp_center[3] > 1.6 && lt_snr_org < 3.5 )

        if ( ( snr_flux > 1.5f ) && sp_center[3] > 1.6f && lt_snr_org < 3.5f )

        {

            vad_flag = 1;

        }

        if ( ( snr_flux > 1.2 ) && sp_center[3] > 1.9 && lt_snr_org < 3.5 )

        if ( ( snr_flux > 1.2f ) && sp_center[3] > 1.9 && lt_snr_org < 3.5f )

        {

            vad_flag = 1;

        }

        if ( ( snr_flux > 1.00f ) && sp_center[3] > 3.2 && lt_snr_org < 3.5 )

        if ( ( snr_flux > 1.00f ) && sp_center[3] > 3.2f && lt_snr_org < 3.5f )

        {

            vad_flag = 1;

        }
@@ -197,19 +197,19 @@ int16_t comvad_decision( 


    if ( bw_index == CLDFBVAD_WB_ID )

    {

        if ( ( snr_flux > 2.1 + lt_snr * 0.24 ) )

        if ( ( snr_flux > 2.1f + lt_snr * 0.24f ) )

        {

            vad_flag = 1;

        }

        if ( ( snr_flux > 1.6 ) && sp_center[3] > 2.5 && lt_snr_org < 3.5 )

        if ( ( snr_flux > 1.6f ) && sp_center[3] > 2.5f && lt_snr_org < 3.5f )

        {

            vad_flag = 1;

        }

        if ( ( snr_flux > 1.2 ) && sp_center[3] > 2.8 && lt_snr_org < 3.5 )

        if ( ( snr_flux > 1.2f ) && sp_center[3] > 2.8f && lt_snr_org < 3.5f )

        {

            vad_flag = 1;

        }

        if ( ( snr_flux > 1.0 ) && sp_center[3] > 4.5 && lt_snr_org < 3.5 )

        if ( ( snr_flux > 1.0f ) && sp_center[3] > 4.5f && lt_snr_org < 3.5f )

        {

            vad_flag = 1;

        }
@@ -217,19 +217,19 @@ int16_t comvad_decision( 


    if ( bw_index == CLDFBVAD_SWB_ID )

    {

        if ( ( snr_flux > 2.1 + lt_snr * 0.32 ) )

        if ( ( snr_flux > 2.1f + lt_snr * 0.32f ) )

        {

            vad_flag = 1;

        }

        if ( ( snr_flux > 1.68 ) && sp_center[3] > 2.76 && lt_snr_org < 3.5 )

        if ( ( snr_flux > 1.68f ) && sp_center[3] > 2.76f && lt_snr_org < 3.5f )

        {

            vad_flag = 1;

        }

        if ( ( snr_flux > 1.24 ) && sp_center[3] > 2.92 && lt_snr_org < 3.5 )

        if ( ( snr_flux > 1.24f ) && sp_center[3] > 2.92f && lt_snr_org < 3.5f )

        {

            vad_flag = 1;

        }

        if ( ( snr_flux > 1.10f ) && sp_center[3] > 4.6 && lt_snr_org < 3.5 )

        if ( ( snr_flux > 1.10f ) && sp_center[3] > 4.6f && lt_snr_org < 3.5f )

        {

            vad_flag = 1;

        }
@@ -237,7 +237,7 @@ int16_t comvad_decision( 


    if ( hVAD_CLDFB->fg_energy_est_start == 0 )

    {

        if ( ltd_stable_rate[0] > 0.08 && vad_flag == 1 && frame_energy > 50 )

        if ( ltd_stable_rate[0] > 0.08f && vad_flag == 1 && frame_energy > 50 )

        {

            hVAD_CLDFB->fg_energy_est_start = 1;

        }
@@ -263,9 +263,9 @@ int16_t comvad_decision( 
        {

            vad_flag = vada_flag;

        }

        else if ( hVAD_CLDFB->lf_snr_smooth < 10.5 || SILENCE != noisy_type )

        else if ( hVAD_CLDFB->lf_snr_smooth < 10.5f || SILENCE != noisy_type )

        {

            if ( ( snr_flux > 1.8 ) || ( ( hVAD_CLDFB->continuous_speech_num2 > 40 ) && ( snr_flux > 1.6 ) ) || music_backgound_f == 1 )

            if ( ( snr_flux > 1.8f ) || ( ( hVAD_CLDFB->continuous_speech_num2 > 40 ) && ( snr_flux > 1.6f ) ) || music_backgound_f == 1 )

            {

                vad_flag = vada_flag | vadb_flag;

            }
@@ -284,9 +284,9 @@ int16_t comvad_decision( 
        }

        else

        {

            if ( hVAD_CLDFB->lf_snr_smooth < 10.5 || SILENCE != noisy_type )

            if ( hVAD_CLDFB->lf_snr_smooth < 10.5f || SILENCE != noisy_type )

            {

                if ( ( snr_flux > 2.2 ) || ( ( hVAD_CLDFB->continuous_speech_num2 > 40 ) && ( snr_flux > 1.6 ) ) || music_backgound_f == 1 )

                if ( ( snr_flux > 2.2f ) || ( ( hVAD_CLDFB->continuous_speech_num2 > 40 ) && ( snr_flux > 1.6f ) ) || music_backgound_f == 1 )

                {

                    vad_flag = vada_flag | vadb_flag;

                }
@@ -301,14 +301,14 @@ int16_t comvad_decision( 
    {

        if ( noisy_type == SILENCE )

        {

            if ( hVAD_CLDFB->lf_snr_smooth > 12.5 && music_backgound_f == 0 )

            if ( hVAD_CLDFB->lf_snr_smooth > 12.5f && music_backgound_f == 0 )

            {

                vad_flag = vada_flag;

            }

        }

        else

        {

            if ( ( snr_flux > 2.0 ) || ( hVAD_CLDFB->continuous_speech_num2 > 30 && ( snr_flux > 1.5 ) ) || music_backgound_f == 1 )

            if ( ( snr_flux > 2.0f ) || ( hVAD_CLDFB->continuous_speech_num2 > 30 && ( snr_flux > 1.5f ) ) || music_backgound_f == 1 )

            {

                vad_flag = vada_flag | vadb_flag;

            }
@@ -325,7 +325,7 @@ int16_t comvad_decision( 
            hVAD_CLDFB->l_silence_snr += snr;

            hVAD_CLDFB->l_silence_snr_count++;

        }

        else if ( snr < 0.8 )

        else if ( snr < 0.8f )

        {

            hVAD_CLDFB->l_silence_snr += snr;

            hVAD_CLDFB->l_silence_snr_count++;
@@ -340,7 +340,7 @@ int16_t comvad_decision( 
            bg_energy_count = 384;

        }



        if ( tsnr < 1.0 )

        if ( tsnr < 1.0f )

        {

            bg_energy = bg_energy + frame_energy;

            bg_energy_count = bg_energy_count + 1;
@@ -431,15 +431,15 @@ float construct_snr_thresh( 
        {

            snr_delta = snr_delta + 0.00f;

        }

        else if ( sp_center[2] > 2.6 )

        else if ( sp_center[2] > 2.6f )

        {

            snr_delta = snr_delta + 0.03f;

        }

        else if ( sp_center[2] > 1.6 )

        else if ( sp_center[2] > 1.6f )

        {

            snr_delta = snr_delta + 0.05f;

        }

        else if ( sp_center[3] > 1.4 )

        else if ( sp_center[3] > 1.4f )

        {

            snr_delta = snr_delta + 0.10f;

        }
@@ -452,7 +452,7 @@ float construct_snr_thresh( 
        {

            snr_delta = snr_delta - 0.2f;

        }

        else if ( continuous_noise_num > 12 && ( snr_flux > 0.6 + lf_snr * 0.1 ) )

        else if ( continuous_noise_num > 12 && ( snr_flux > 0.6f + lf_snr * 0.1f ) )

        {

            snr_delta = snr_delta + 0.1f;

        }
@@ -472,15 +472,15 @@ float construct_snr_thresh( 
        {

            snr_delta = snr_delta + 0.00f;

        }

        else if ( sp_center[2] > 2.6 )

        else if ( sp_center[2] > 2.6f )

        {

            snr_delta = snr_delta + 0.03f;

        }

        else if ( sp_center[2] > 1.6 )

        else if ( sp_center[2] > 1.6f )

        {

            snr_delta = snr_delta + 0.05f;

        }

        else if ( sp_center[3] > 1.4 )

        else if ( sp_center[3] > 1.4f )

        {

            snr_delta = snr_delta + 0.10f;

        }
@@ -493,7 +493,7 @@ float construct_snr_thresh( 
        {

            snr_delta = snr_delta - 0.1f;

        }

        else if ( continuous_noise_num > 12 && ( snr_flux > 0.6 + bw_snr * 0.1 ) )

        else if ( continuous_noise_num > 12 && ( snr_flux > 0.6f + bw_snr * 0.1f ) )

        {

            snr_delta = snr_delta + 0.1f;

        }
@@ -510,19 +510,19 @@ float construct_snr_thresh( 
    {

        test_l_snr = lt_snr;



        if ( sp_center[3] > 3.0 )

        if ( sp_center[3] > 3.0f )

        {

            snr_delta = snr_delta + 0.00f;

        }

        else if ( sp_center[2] > 2.6 )

        else if ( sp_center[2] > 2.6f )

        {

            snr_delta = snr_delta + 0.02f;

        }

        else if ( sp_center[2] > 1.6 )

        else if ( sp_center[2] > 1.6f )

        {

            snr_delta = snr_delta + 0.04f;

        }

        else if ( sp_center[2] > 1.46 )

        else if ( sp_center[2] > 1.46f )

        {

            snr_delta = snr_delta + 0.10f;

        }
@@ -531,15 +531,15 @@ float construct_snr_thresh( 
            snr_delta = snr_delta + 0.18f;

        }



        if ( continuous_speech_num > 80 && fg_energy_est_start == 1 && ( sp_center[0] > 1.4 ) )

        if ( continuous_speech_num > 80 && fg_energy_est_start == 1 && ( sp_center[0] > 1.4f ) )

        {

            snr_delta = snr_delta - 0.32f;

        }

        else if ( continuous_speech_num > 8 && fg_energy_est_start == 1 && ( snr_flux > 0.2 + lf_snr * 0.1 ) )

        else if ( continuous_speech_num > 8 && fg_energy_est_start == 1 && ( snr_flux > 0.2f + lf_snr * 0.1f ) )

        {

            snr_delta = snr_delta - 0.1f;

        }

        else if ( continuous_noise_num > 12 && ( snr_flux > 0.6 + lf_snr * 0.1 ) )

        else if ( continuous_noise_num > 12 && ( snr_flux > 0.6f + lf_snr * 0.1f ) )

        {

            snr_delta = snr_delta + 0.1f;

        }
@@ -597,7 +597,7 @@ static int16_t comvad_hangover( 
            {

                speech_flag = 8 - continuous_speech_num2;

            }

            else if ( ( snr_flux > 0.8 ) && ( continuous_speech_num2 > 24 ) )

            else if ( ( snr_flux > 0.8f ) && ( continuous_speech_num2 > 24 ) )

            {

                if ( lt_snr_org > 3.6f )

                {
@@ -620,11 +620,11 @@ static int16_t comvad_hangover( 


            if ( continuous_speech_num2 < 120 )

            {

                if ( snr > 1.5 )

                if ( snr > 1.5f )

                {

                    speech_flag = 9;

                }

                else if ( snr > 1.0 && speech_flag < 7 )

                else if ( snr > 1.0f && speech_flag < 7 )

                {

                    speech_flag = 7;

                }
@@ -688,7 +688,7 @@ static int16_t comvad_hangover( 
            {

                speech_flag = 8 - continuous_speech_num2;

            }

            else if ( ( snr_flux > 0.9 ) && ( continuous_speech_num2 > 50 ) )

            else if ( ( snr_flux > 0.9f ) && ( continuous_speech_num2 > 50 ) )

            {

                if ( lt_snr_org > 3.6f )

                {
@@ -715,15 +715,15 @@ static int16_t comvad_hangover( 


            if ( continuous_speech_num2 < 120 )

            {

                if ( snr > 1.5 )

                if ( snr > 1.5f )

                {

                    speech_flag = 6;

                }

                else if ( snr > 1.0 && speech_flag < 5 )

                else if ( snr > 1.0f && speech_flag < 5 )

                {

                    speech_flag = 5;

                }

                else if ( snr > 0.8 && lt_snr_org < 2 && speech_flag < 4 )

                else if ( snr > 0.8f && lt_snr_org < 2 && speech_flag < 4 )

                {

                    speech_flag = 4;

                }
@@ -779,7 +779,7 @@ static int16_t comvad_hangover( 
            {

                speech_flag = 8 - continuous_speech_num2;

            }

            else if ( ( snr_flux > 0.8 + lf_snr * 0.1 ) && ( continuous_speech_num2 > 24 ) )

            else if ( ( snr_flux > 0.8f + lf_snr * 0.1f ) && ( continuous_speech_num2 > 24 ) )

            {

                if ( lt_snr_org > 3.6f )

                {
@@ -806,11 +806,11 @@ static int16_t comvad_hangover( 


            if ( continuous_speech_num2 < 120 )

            {

                if ( snr > 1.5 )

                if ( snr > 1.5f )

                {

                    speech_flag = 10;

                }

                else if ( snr > 1.0 && speech_flag < 7 )

                else if ( snr > 1.0f && speech_flag < 7 )

                {

                    speech_flag = 7;

                }