Commit ca94fa93 authored by Stephane Ragot's avatar Stephane Ragot
Browse files

fixing warnings on Windows

parent 6ae20f18

lib_com/tools.c

+1 −1
Original line number Diff line number Diff line
@@ -780,7 +780,7 @@ float inv_sqrtf( 
    const float x /* i  : input value                        */

)

{

    return ( 1.0 / sqrtf( x ) );

    return ( 1.0f / sqrtf( x ) );

}

#endif

lib_enc/ivas_stereo_dmx_evs.c

+7 −7
Original line number Diff line number Diff line
@@ -618,7 +618,7 @@ static void calc_poc( 
    }

    else

    {

        if ( ( hPHA->iccr_s < STEREO_DMX_EVS_ICCR_HYST_L ) || ( ( hPHA->iccr_s < STEREO_DMX_EVS_ICCR_HYST_H ) && ( hPHA->proc_pha = STEREO_DMX_EVS_PHA_IPD2 ) && !hPHA->force_poc ) )

        if ( ( hPHA->iccr_s < STEREO_DMX_EVS_ICCR_HYST_L ) || ( ( hPHA->iccr_s < STEREO_DMX_EVS_ICCR_HYST_H ) && ( hPHA->proc_pha == STEREO_DMX_EVS_PHA_IPD2 ) && !hPHA->force_poc ) )

        {

            hPHA->force_poc = FALSE;

            hPHA->proc_pha = STEREO_DMX_EVS_PHA_IPD2;
@@ -684,7 +684,7 @@ static void calc_poc( 
        tmp2 = spectral_flatness( &rfft_pha_buf[input_frame_pha - hPHA->pha_len], hPHA->pha_len );



        /* Combined ILD/SF channel selection with tempo */

        if ( ( ( tmp1 > tmp2 ) && ( pha_ipd_ild_chan2rephase = -1 ) ) || ( pha_ipd_ild_chan2rephase = 0 ) ) /* L => R */

        if ( ( ( tmp1 > tmp2 ) && ( pha_ipd_ild_chan2rephase == -1 ) ) || ( pha_ipd_ild_chan2rephase == 0 ) ) /* L => R */

        {

            if ( hPHA->pha_ipd_previouschan2rephase == 0 )

            {
@@ -1324,16 +1324,16 @@ static float spectral_flatness( 
    const int16_t sigLength /* i  : input signal length        */

)

{

    float geoMean = 0.0;

    float ariMean = 0.0;

    float eps = 1e-10;

    float geoMean = 0.0f;

    float ariMean = 0.0f;

    float eps = 1e-10f;

    int16_t i;



    /* Initialization */

    for ( i = 0; i < sigLength; i++ )

    {

        ariMean += fabs( sig[i] ) + eps;

        geoMean += logf( fabs( sig[i] ) + eps );

        ariMean += fabsf( sig[i] ) + eps;

        geoMean += logf( fabsf( sig[i] ) + eps );

    }

    ariMean /= sigLength;

    geoMean /= sigLength;