Commit e7d435e9 authored by emerit's avatar emerit
Browse files

align float and basop code

parent 3e230f05

lib_rend/lib_rend.c

+0 −48
Original line number Diff line number Diff line
@@ -2241,23 +2241,7 @@ static ivas_error updateMcPanGainsForMcOut( 
        if ( ( inputMc->base.inConfig == IVAS_AUDIO_CONFIG_MONO ) && ( inputMc->nonDiegeticPan ) )

        {

#ifdef FIX_1548_HARMONIZE_NON_DIEGETIC_PANNING_LAW

#ifdef FIX_2570_BUF_OVFL

            if ( inputMc->nonDiegeticPanGain < -1.f )

            {

                wrapped_angle = -2.f - inputMc->nonDiegeticPanGain;

            }

            else if ( inputMc->nonDiegeticPanGain > 1.f )

            {

                wrapped_angle = 2.f - inputMc->nonDiegeticPanGain;

            }

            else

            {

                wrapped_angle = inputMc->nonDiegeticPanGain;

            }

            pan = ( wrapped_angle + 1.f ) * 0.5f;

#else

            pan = ( inputMc->nonDiegeticPanGain + 1.f ) * 0.5f;

#endif

            inputMc->panGains[0][0] = sinf( pan * EVS_PI * 0.5f );

            inputMc->panGains[0][1] = cosf( pan * EVS_PI * 0.5f );

#else
@@ -2405,23 +2389,7 @@ static ivas_error updateMcPanGainsForBinauralOut( 
    if ( inputMc->base.inConfig == IVAS_AUDIO_CONFIG_MONO )

    {

#ifdef FIX_1548_HARMONIZE_NON_DIEGETIC_PANNING_LAW

#ifdef FIX_2570_BUF_OVFL

        if ( inputMc->nonDiegeticPanGain < -1.f )

        {

            wrapped_angle = -2.f - inputMc->nonDiegeticPanGain;

        }

        else if ( inputMc->nonDiegeticPanGain > 1.f )

        {

            wrapped_angle = 2.f - inputMc->nonDiegeticPanGain;

        }

        else

        {

            wrapped_angle = inputMc->nonDiegeticPanGain;

        }

        pan = ( wrapped_angle + 1.f ) * 0.5f;

#else

        pan = ( inputMc->nonDiegeticPanGain + 1.f ) * 0.5f;

#endif

        inputMc->panGains[0][0] = sinf( pan * EVS_PI * 0.5f );

        inputMc->panGains[0][1] = cosf( pan * EVS_PI * 0.5f );

#else
@@ -6062,23 +6030,7 @@ static ivas_error renderIsmToMc( 
        if ( ismInput->nonDiegeticPan )

        {

#ifdef FIX_1548_HARMONIZE_NON_DIEGETIC_PANNING_LAW

#ifdef FIX_2570_BUF_OVFL

            if ( ismInput->nonDiegeticPanGain < -1.f )

            {

                wrapped_angle = -2.f - ismInput->nonDiegeticPanGain;

            }

            else if ( ismInput->nonDiegeticPanGain > 1.f )

            {

                wrapped_angle = 2.f - ismInput->nonDiegeticPanGain;

            }

            else

            {

                wrapped_angle = ismInput->nonDiegeticPanGain;

            }

            pan = ( wrapped_angle + 1.f ) * 0.5f;

#else

            pan = ( ismInput->nonDiegeticPanGain + 1.f ) * 0.5f;

#endif

            ismInput->prev_pan_gains[0] = currentPanGains[0] = sinf( pan * EVS_PI * 0.5f );

            ismInput->prev_pan_gains[1] = currentPanGains[1] = cosf( pan * EVS_PI * 0.5f );

#else