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

Fix for warnings in MSVS

parent 20d2c151

lib_dec/ivas_svd_dec.c

+2 −2
Original line number Diff line number Diff line
@@ -1971,11 +1971,11 @@ static Word32 maxWithSign_fx( 
    }

#else

    Word32 result;

    if ( a >= 0 )

    IF( a >= 0 )

    {

        result = L_max( a, SVD_MINIMUM_VALUE_FX );

    }

    if ( a < 0 )

    ELSE

    {

        result = L_min( a, -SVD_MINIMUM_VALUE_FX );

    }

lib_enc/cod_tcx.c

+2 −2
Original line number Diff line number Diff line
@@ -290,7 +290,7 @@ void TNSAnalysisStereo_fx( 
                                    Word16 maxEnergyChange_fx;

                                    maxEnergyChange_fx = mac_r( L_mult( GetTCXMaxenergyChange_ivas_fx( sts[0]->hTranDet, isTCX10, NSUBBLOCKS, 3 ), 16384 ), GetTCXMaxenergyChange_ivas_fx( sts[1]->hTranDet, isTCX10, NSUBBLOCKS, 3 ), 16384 );



                                    IF( GE_16( maxEnergyChange_fx, L_shl( pTnsParameters[0]->minEnergyChange, Q3 - Q7 ) ) )

                                    IF( GE_16( maxEnergyChange_fx, shl( pTnsParameters[0]->minEnergyChange, Q3 - Q7 ) ) )

                                    {

                                        sts[0]->hTcxEnc->tnsData[k].nFilters = add( sts[0]->hTcxEnc->tnsData[k].nFilters, 1 );

                                        move16();
@@ -552,7 +552,7 @@ void TNSAnalysisStereo_fx( 
                        {

                            Word16 maxEnergyChange_fx = GetTCXMaxenergyChange_ivas_fx( sts[ch]->hTranDet, isTCX10, NSUBBLOCKS, 3 );



                            IF( GE_16( maxEnergyChange_fx, L_shl( pTnsParameters->minEnergyChange, Q3 - Q7 ) ) )

                            IF( GE_16( maxEnergyChange_fx, shl( pTnsParameters->minEnergyChange, Q3 - Q7 ) ) )

                            {

                                sts[ch]->hTcxEnc->tnsData[k].nFilters = add( sts[ch]->hTcxEnc->tnsData[k].nFilters, 1 );

                                move16();

lib_enc/tns_base_enc_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -675,7 +675,7 @@ Word16 DetectTnsFilt_ivas_fx( STnsConfig const *pTnsConfig, /* i : TNS Configur 
            ELSE

            {

                maxEnergyChange = GetTCXMaxenergyChange_ivas_fx( hTranDet, isTCX10, NSUBBLOCKS, 3 );

                IF( sub( maxEnergyChange, L_shl( pTnsParameters->minEnergyChange, Q3 - Q7 ) ) >= 0 )

                IF( sub( maxEnergyChange, shl( pTnsParameters->minEnergyChange, Q3 - Q7 ) ) >= 0 )

                {



                    pTnsData->nFilters = add( pTnsData->nFilters, 1 );