Commit 88002bfa authored by Gregory Pallone's avatar Gregory Pallone
Browse files

split statement and declaration part3

parent d905daf9

lib_rend/lib_rend.c

+13 −3
Original line number Diff line number Diff line
@@ -2211,6 +2211,9 @@ static ivas_error updateMcPanGainsForMcOut( 
    const AUDIO_CONFIG outConfig )

{

    ivas_error error;

#ifdef FIX_1548_HARMONIZE_NON_DIEGETIC_PANNING_LAW

    float pan;

#endif



    /* "if" conditions below realize the following mapping:
@@ -2235,7 +2238,7 @@ static ivas_error updateMcPanGainsForMcOut( 
        if ( ( inputMc->base.inConfig == IVAS_AUDIO_CONFIG_MONO ) && ( inputMc->nonDiegeticPan ) )

        {

#ifdef FIX_1548_HARMONIZE_NON_DIEGETIC_PANNING_LAW

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

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

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

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

#else
@@ -2372,11 +2375,15 @@ static ivas_error updateMcPanGainsForAmbiOut( 
static ivas_error updateMcPanGainsForBinauralOut(

    input_mc *inputMc )

{

#ifdef FIX_1548_HARMONIZE_NON_DIEGETIC_PANNING_LAW

    float pan;

#endif



    setZeroPanMatrix( inputMc->panGains );

    if ( inputMc->base.inConfig == IVAS_AUDIO_CONFIG_MONO )

    {

#ifdef FIX_1548_HARMONIZE_NON_DIEGETIC_PANNING_LAW

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

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

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

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

#else
@@ -6013,6 +6020,9 @@ static ivas_error renderIsmToMc( 
    int8_t position_changed;

    pan_vector currentPanGains;

    ivas_error error;

#ifdef FIX_1548_HARMONIZE_NON_DIEGETIC_PANNING_LAW

    float pan;

#endif



    push_wmops( "renderIsmToMc" );
@@ -6022,7 +6032,7 @@ static ivas_error renderIsmToMc( 
        if ( ismInput->nonDiegeticPan )

        {

#ifdef FIX_1548_HARMONIZE_NON_DIEGETIC_PANNING_LAW

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

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

            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